Commits

Benoit Boissinot committed c631eca

[i18n] bump genshi dependency to 0.6, make use of advanced i18n features

Comments (0)

Files changed (26)

ckan/config/environment.py

 """Pylons environment configuration"""
 import os
 
+import pylons
 from sqlalchemy import engine_from_config
 from pylons import config
 from genshi.template import TemplateLoader
 from ckan import model
 
 from genshi.filters.i18n import Translator
-from pylons.i18n.translation import ugettext
 
 def load_environment(global_conf, app_conf):
     """Configure the Pylons environment via the ``pylons.config``
         template_paths = extra_template_paths.split(',') + template_paths
 
     # Translator (i18n)
-    translator = Translator(ugettext)
+    translator = Translator(pylons.translator)
     def template_loaded(template):
-        template.filters.insert(0, translator)
+        translator.setup(template)
 
     # Create the Genshi TemplateLoader
     # config['pylons.app_globals'].genshi_loader = TemplateLoader(

ckan/i18n/ckan.pot

 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ckan 1.0\n"
+"Project-Id-Version: ckan 1.1a\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2010-05-25 23:05+0200\n"
+"POT-Creation-Date: 2010-05-30 21:16+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.4\n"
 
-#: ckan/controllers/group.py:31
+#: ckan/controllers/group.py:30
 #, python-format
 msgid "Not authorized to read %s"
 msgstr ""
 
-#: ckan/controllers/group.py:54
+#: ckan/controllers/group.py:53
 msgid "Must be logged in to create a new group."
 msgstr ""
 
-#: ckan/controllers/group.py:102
+#: ckan/controllers/group.py:101
 #, python-format
 msgid "User %r not authorized to edit %r"
 msgstr ""
 
-#: ckan/controllers/group.py:140
+#: ckan/controllers/group.py:139
 msgid "Group not found"
 msgstr ""
 
-#: ckan/controllers/group.py:145
+#: ckan/controllers/group.py:144
 msgid "Not authorized to edit authization for group"
 msgstr ""
 
-#: ckan/controllers/group.py:172 ckan/controllers/package.py:328
+#: ckan/controllers/group.py:171 ckan/controllers/package.py:327
 #, python-format
 msgid "Added role '%s' for user '%s'"
 msgstr ""
 
-#: ckan/controllers/group.py:179 ckan/controllers/package.py:335
+#: ckan/controllers/group.py:178 ckan/controllers/package.py:334
 msgid "Error: No role found with that id"
 msgstr ""
 
-#: ckan/controllers/group.py:182 ckan/controllers/package.py:337
+#: ckan/controllers/group.py:181 ckan/controllers/package.py:336
 #, python-format
 msgid "Deleted role '%s' for user '%s'"
 msgstr ""
 msgid "User %r unauthorized to edit existing package %s"
 msgstr ""
 
-#: ckan/controllers/package.py:76 ckan/controllers/package.py:112
-#: ckan/controllers/package.py:297
+#: ckan/controllers/package.py:75 ckan/controllers/package.py:111
+#: ckan/controllers/package.py:296
 msgid "Package not found"
 msgstr ""
 
-#: ckan/controllers/package.py:87
+#: ckan/controllers/package.py:86
 #, python-format
 msgid "Unauthorized to read package %s"
 msgstr ""
 
-#: ckan/controllers/package.py:106
+#: ckan/controllers/package.py:105
 msgid "Select two revisions before doing the comparison."
 msgstr ""
 
-#: ckan/controllers/package.py:118
+#: ckan/controllers/package.py:117
 msgid "CKAN Package Revision History"
 msgstr ""
 
-#: ckan/controllers/package.py:120
+#: ckan/controllers/package.py:119
 msgid "Recent changes to CKAN Package: "
 msgstr ""
 
-#: ckan/controllers/package.py:139
+#: ckan/controllers/package.py:138
 msgid "Log message: "
 msgstr ""
 
-#: ckan/controllers/package.py:228
+#: ckan/controllers/package.py:227
 #, python-format
 msgid "User %r not authorized to edit %s"
 msgstr ""
 
-#: ckan/controllers/package.py:302
+#: ckan/controllers/package.py:301
 #, python-format
 msgid "User %r not authorized to edit %s authorizations"
 msgstr ""
 
-#: ckan/controllers/package.py:353
+#: ckan/controllers/package.py:352
 msgid "404 Package Not Found"
 msgstr ""
 
-#: ckan/controllers/package.py:359
+#: ckan/controllers/package.py:358
 msgid "Rating value invalid"
 msgstr ""
 
-#: ckan/controllers/rest.py:132 ckan/controllers/rest.py:223
-#: ckan/controllers/rest.py:299
+#: ckan/controllers/rest.py:141 ckan/controllers/rest.py:232
+#: ckan/controllers/rest.py:308
 msgid "Access denied"
 msgstr ""
 
-#: ckan/controllers/rest.py:137 ckan/controllers/rest.py:229
+#: ckan/controllers/rest.py:146 ckan/controllers/rest.py:238
 #, python-format
 msgid "JSON Error: %s"
 msgstr ""
 
-#: ckan/controllers/rest.py:159
+#: ckan/controllers/rest.py:168
 #, python-format
 msgid "REST API: Create package relationship: %s %s %s"
 msgstr ""
 
-#: ckan/controllers/rest.py:170
+#: ckan/controllers/rest.py:179
 #, python-format
 msgid "Cannot create new entity of this type: %s %s"
 msgstr ""
 
-#: ckan/controllers/rest.py:177
+#: ckan/controllers/rest.py:186
 #, python-format
 msgid "REST API: Create object %s"
 msgstr ""
 
-#: ckan/controllers/rest.py:215
+#: ckan/controllers/rest.py:224
 #, python-format
 msgid "Cannot update entity of this type: %s"
 msgstr ""
 
-#: ckan/controllers/rest.py:248
+#: ckan/controllers/rest.py:257
 #, python-format
 msgid "REST API: Update object %s"
 msgstr ""
 
-#: ckan/controllers/rest.py:293
+#: ckan/controllers/rest.py:302
 #, python-format
 msgid "Cannot delete entity of this type: %s %s"
 msgstr ""
 
-#: ckan/controllers/rest.py:304
+#: ckan/controllers/rest.py:313
 #, python-format
 msgid "REST API: Delete %s"
 msgstr ""
 
-#: ckan/controllers/rest.py:334
+#: ckan/controllers/rest.py:349
 msgid "Blank qjson parameter"
 msgstr ""
 
-#: ckan/controllers/rest.py:343
+#: ckan/controllers/rest.py:358
 #, python-format
 msgid "Search params: %s"
 msgstr ""
 
-#: ckan/controllers/rest.py:371
+#: ckan/controllers/rest.py:386
 msgid "You must supply a package name (parameter \"package\")."
 msgstr ""
 
-#: ckan/controllers/rest.py:373
+#: ckan/controllers/rest.py:388
 msgid "You must supply a rating (parameter \"rating\")."
 msgstr ""
 
-#: ckan/controllers/rest.py:378
+#: ckan/controllers/rest.py:393
 msgid "Rating must be an integer value."
 msgstr ""
 
-#: ckan/controllers/rest.py:382
+#: ckan/controllers/rest.py:397
 #, python-format
 msgid "Rating must be between %i and %i."
 msgstr ""
 
-#: ckan/controllers/rest.py:384
+#: ckan/controllers/rest.py:399
 #, python-format
 msgid "Package with name %r does not exist."
 msgstr ""
 
-#: ckan/controllers/rest.py:447
+#: ckan/controllers/rest.py:462
 #, python-format
 msgid "Can't find entity data in request params %s: %s"
 msgstr ""
 
-#: ckan/controllers/rest.py:453
+#: ckan/controllers/rest.py:468
 msgid "Request params must be in form of a json encoded dictionary."
 msgstr ""
 
-#: ckan/controllers/rest.py:482
+#: ckan/controllers/rest.py:497
 #, python-format
 msgid "REST API: Update package relationship: %s %s %s"
 msgstr ""
 msgid "Value does not match required format: %s"
 msgstr ""
 
-#: ckan/forms/common.py:430
+#: ckan/forms/common.py:436
 #, python-format
 msgid "Tag \"%s\" length is less than minimum %s"
 msgstr ""
 
-#: ckan/forms/common.py:432
+#: ckan/forms/common.py:438
 #, python-format
 msgid "Tag \"%s\" must be alphanumeric characters or symbols: -_."
 msgstr ""
 
-#: ckan/forms/common.py:434
+#: ckan/forms/common.py:440
 #, python-format
 msgid "Tag \"%s\" must not be uppercase"
 msgstr ""
 
-#: ckan/forms/common.py:451
+#: ckan/forms/common.py:457
 #, python-format
 msgid "Duplicate key \"%s\""
 msgstr ""
 
-#: ckan/forms/common.py:454
+#: ckan/forms/common.py:460
 #, python-format
 msgid "Extra key-value pair: key is not set for value \"%s\"."
 msgstr ""
 
-#: ckan/forms/common.py:588
+#: ckan/forms/common.py:594
 msgid "other - please specify"
 msgstr ""
 
-#: ckan/forms/common.py:604
+#: ckan/forms/common.py:610
 msgid "Other"
 msgstr ""
 
 msgstr ""
 
 #: ckan/forms/package.py:32 ckan/forms/package.py:60 ckan/forms/package_ca.py:48
-#: ckan/forms/package_ca.py:82 ckan/templates/home/license.html:4
+#: ckan/forms/package_ca.py:82 ckan/templates/home/license.html:5
 #: ckan/templates/package/read_core.html:71
 msgid "License"
 msgstr ""
 
 #: ckan/forms/package.py:33 ckan/forms/package.py:60 ckan/forms/package_ca.py:51
-#: ckan/forms/package_ca.py:82 ckan/templates/layout.html:75
-#: ckan/templates/tag/index.html:7
+#: ckan/forms/package_ca.py:82 ckan/templates/layout.html:76
+#: ckan/templates/tag/index.html:8
 msgid "Tags"
 msgstr ""
 
 msgid "Title"
 msgstr ""
 
-#: ckan/forms/package.py:58 ckan/templates/package/read.html:15
+#: ckan/forms/package.py:58
 msgid "Version"
 msgstr ""
 
 msgid "URL"
 msgstr ""
 
-#: ckan/forms/package.py:59 ckan/templates/home/index.html:82
+#: ckan/forms/package.py:59 ckan/templates/home/index.html:83
 #: ckan/templates/package/history.html:27 ckan/templates/revision/list.html:16
 #: ckan/templates/user/read.html:37
 msgid "Author"
 msgid "%(message)s"
 msgstr ""
 
-#: ckan/templates/layout.html:11
+#: ckan/templates/layout.html:12
 msgid "CKAN - Comprehensive Knowledge Archive Network -"
 msgstr ""
 
-#: ckan/templates/layout.html:19
+#: ckan/templates/layout.html:20
 msgid "CKAN Recent Changes"
 msgstr ""
 
-#: ckan/templates/layout.html:53
-msgid "Logged in as"
-msgstr ""
-
-#: ckan/templates/layout.html:55
-msgid "My account"
-msgstr ""
-
-#: ckan/templates/layout.html:56 ckan/templates/user/logout.html:7
-msgid "Logout"
+#: ckan/templates/layout.html:54
+#, python-format
+msgid ""
+"Logged in as [1:%(openid_icon)s %(user)s]\n"
+"            · [2:My account]\n"
+"\t    · [3:Logout]"
 msgstr ""
 
 #: ckan/templates/layout.html:59
-msgid "Login with"
+#, python-format
+msgid "[1:Login with %(openid_icon)s OpenID]"
 msgstr ""
 
-#: ckan/templates/layout.html:59
-msgid "OpenID"
-msgstr ""
-
-#: ckan/templates/layout.html:65
+#: ckan/templates/layout.html:66
 msgid "CKAN Logo"
 msgstr ""
 
-#: ckan/templates/layout.html:71
+#: ckan/templates/layout.html:72
 msgid "Sections:"
 msgstr ""
 
-#: ckan/templates/layout.html:73 ckan/templates/group/layout.html:18
-#: ckan/templates/home/about.html:4 ckan/templates/home/index.html:4
+#: ckan/templates/layout.html:74 ckan/templates/group/layout.html:19
+#: ckan/templates/home/about.html:5 ckan/templates/home/index.html:5
 #: ckan/templates/package/layout.html:19
 msgid "Home"
 msgstr ""
 
-#: ckan/templates/layout.html:74 ckan/templates/group/edit_form.html:10
-#: ckan/templates/home/index.html:81 ckan/templates/package/index.html:7
-#: ckan/templates/package/list.html:32 ckan/templates/revision/list.html:16
+#: ckan/templates/layout.html:75 ckan/templates/group/edit_form.html:10
+#: ckan/templates/home/index.html:82 ckan/templates/package/index.html:8
+#: ckan/templates/package/list.html:33 ckan/templates/revision/list.html:16
 #: ckan/templates/revision/read.html:20 ckan/templates/user/read.html:37
 msgid "Packages"
 msgstr ""
 
-#: ckan/templates/layout.html:76 ckan/templates/group/index.html:7
+#: ckan/templates/layout.html:77 ckan/templates/group/index.html:8
 msgid "Groups"
 msgstr ""
 
-#: ckan/templates/layout.html:77 ckan/templates/user/read.html:34
+#: ckan/templates/layout.html:78 ckan/templates/user/read.html:34
 msgid "Recent changes"
 msgstr ""
 
-#: ckan/templates/layout.html:78
+#: ckan/templates/layout.html:79
 msgid "API"
 msgstr ""
 
-#: ckan/templates/layout.html:80
+#: ckan/templates/layout.html:81
 msgid "In this section:"
 msgstr ""
 
-#: ckan/templates/layout.html:91
+#: ckan/templates/layout.html:92
 msgid "Skip to page content"
 msgstr ""
 
-#: ckan/templates/layout.html:91
+#: ckan/templates/layout.html:92
 msgid "[ Skip to main content ]"
 msgstr ""
 
-#: ckan/templates/layout.html:105
+#: ckan/templates/layout.html:106
 msgid "Master content template placeholder … please replace me."
 msgstr ""
 
-#: ckan/templates/layout.html:110
+#: ckan/templates/layout.html:111
 msgid "Valid XHTML 1.1"
 msgstr ""
 
-#: ckan/templates/layout.html:110
+#: ckan/templates/layout.html:111
 msgid "XHTML"
 msgstr ""
 
-#: ckan/templates/layout.html:111
+#: ckan/templates/layout.html:112
 msgid "CSS"
 msgstr ""
 
-#: ckan/templates/layout.html:112
+#: ckan/templates/layout.html:113
 msgid "Project Home Page"
 msgstr ""
 
-#: ckan/templates/layout.html:113
+#: ckan/templates/layout.html:114
 msgid "Contact Us"
 msgstr ""
 
-#: ckan/templates/layout.html:114
+#: ckan/templates/layout.html:115
 msgid "Privacy Policy"
 msgstr ""
 
 #: ckan/templates/layout.html:117
-msgid "An"
+msgid "[1:] An [2:Open Knowledge Foundation] Project"
 msgstr ""
 
-#: ckan/templates/layout.html:117 ckan/templates/home/about.html:46
-msgid "Open Knowledge Foundation"
-msgstr ""
-
-#: ckan/templates/layout.html:117
-msgid "Project"
-msgstr ""
-
-#: ckan/templates/layout.html:119
-msgid "v"
+#: ckan/templates/layout.html:124 ckan/templates/layout.html:128
+msgid "This Content and Data is Open"
 msgstr ""
 
 #: ckan/templates/layout.html:120
+#, python-format
 msgid ""
-"| (c) Open Knowledge Foundation\n"
-"\t| All material available under an"
-msgstr ""
-
-#: ckan/templates/layout.html:122 ckan/templates/package/search_form.html:7
-msgid "open license"
-msgstr ""
-
-#: ckan/templates/layout.html:123 ckan/templates/layout.html:127
-msgid "This Content and Data is Open"
+"v%(version)s\n"
+"        | (c) Open Knowledge Foundation\n"
+"\t| All material available under an [1:open license]\n"
+"        | [2:[3:]]\n"
+"        | [4:[5:]]"
 msgstr ""
 
 #: ckan/templates/group/authz.html:4
 msgid "There are no packages currently in this group."
 msgstr ""
 
-#: ckan/templates/group/index.html:4
+#: ckan/templates/group/index.html:5
 msgid "Groups - Index"
 msgstr ""
 
-#: ckan/templates/group/index.html:9 ckan/templates/group/read.html:40
-#: ckan/templates/package/index.html:13 ckan/templates/tag/index.html:18
-#: ckan/templates/tag/index.html:21 ckan/templates/tag/read.html:8
-msgid "There are"
+#: ckan/templates/group/index.html:10
+#, python-format
+msgid "There are [1:%(item_count)s] groups."
 msgstr ""
 
-#: ckan/templates/group/index.html:9
-msgid "groups."
-msgstr ""
-
-#: ckan/templates/group/layout.html:10
+#: ckan/templates/group/layout.html:11
 msgid "Groups section"
 msgstr ""
 
-#: ckan/templates/group/layout.html:11
+#: ckan/templates/group/layout.html:12
 msgid ""
 "Whilst tags are great at collecting packages together, there are occasions "
-"when you want to restrict users from editing a collection. A"
+"when you want to restrict users from editing a collection. A [1:group] can be"
+" set-up to specify which users have permission to add or remove packages from"
+" it."
 msgstr ""
 
-#: ckan/templates/group/layout.html:11
-msgid "group"
+#: ckan/templates/group/layout.html:13
+msgid "To create a new group, please first [1:login]."
 msgstr ""
 
-#: ckan/templates/group/layout.html:11
-msgid ""
-"can be set-up to specify which users have permission to add or remove "
-"packages from it."
+#: ckan/templates/group/layout.html:14
+msgid "[1:Create a new group]"
 msgstr ""
 
-#: ckan/templates/group/layout.html:12
-msgid "To create a new group, please first"
-msgstr ""
-
-#: ckan/templates/group/layout.html:12
-msgid "login"
-msgstr ""
-
-#: ckan/templates/group/layout.html:13 ckan/templates/group/layout.html:19
+#: ckan/templates/group/layout.html:20
 msgid "Create a new group"
 msgstr ""
 
 msgid "New Group"
 msgstr ""
 
-#: ckan/templates/group/read.html:4
+#: ckan/templates/group/read.html:5
 msgid "Groups -"
 msgstr ""
 
-#: ckan/templates/group/read.html:10
+#: ckan/templates/group/read.html:11
 msgid "No Title"
 msgstr ""
 
-#: ckan/templates/group/read.html:18
+#: ckan/templates/group/read.html:19
 msgid "[edit]"
 msgstr ""
 
-#: ckan/templates/group/read.html:21
+#: ckan/templates/group/read.html:22
 msgid "[authorization]"
 msgstr ""
 
-#: ckan/templates/group/read.html:31
+#: ckan/templates/group/read.html:32
 msgid "Administrators:"
 msgstr ""
 
-#: ckan/templates/group/read.html:37
+#: ckan/templates/group/read.html:38
 msgid "Packages:"
 msgstr ""
 
-#: ckan/templates/group/read.html:41
-msgid "packages in this group."
+#: ckan/templates/group/read.html:42
+#, python-format
+msgid "There are %(item_count)s packages in this group."
 msgstr ""
 
-#: ckan/templates/home/about.html:7 ckan/templates/home/index.html:41
+#: ckan/templates/home/about.html:8 ckan/templates/home/index.html:42
 msgid "About CKAN"
 msgstr ""
 
-#: ckan/templates/home/about.html:9
-msgid "CKAN is the Comprehensive Knowledge Archive Network, a"
-msgstr ""
-
-#: ckan/templates/home/about.html:9
-msgid "registry"
-msgstr ""
-
-#: ckan/templates/home/about.html:9
-msgid "of"
-msgstr ""
-
-#: ckan/templates/home/about.html:10
-msgid "open knowledge"
-msgstr ""
-
 #: ckan/templates/home/about.html:10
 msgid ""
-"packages and projects\n"
+"CKAN is the Comprehensive Knowledge Archive Network, a [1:registry] of "
+"[2:open knowledge] packages and projects\n"
 "    (and a few closed ones)."
 msgstr ""
 
-#: ckan/templates/home/about.html:13
-msgid "CKAN makes it easy to"
-msgstr ""
-
-#: ckan/templates/home/about.html:13
-msgid ""
-"find, share and reuse open\n"
-"      content and data"
-msgstr ""
-
 #: ckan/templates/home/about.html:14
 msgid ""
-", especially in ways that are machine\n"
+"CKAN makes it easy to [1:find, share and reuse open\n"
+"      content and data], especially in ways that are machine\n"
 "      automatable."
 msgstr ""
 
-#: ckan/templates/home/about.html:18
+#: ckan/templates/home/about.html:19
 msgid "As a system CKAN functions as a synthesis of several different services:"
 msgstr ""
 
-#: ckan/templates/home/about.html:20
+#: ckan/templates/home/about.html:21
 msgid "CKAN Features Overview"
 msgstr ""
 
-#: ckan/templates/home/about.html:22
+#: ckan/templates/home/about.html:23
 msgid ""
 "As the diagram shows, CKAN combines the features of a listing/registry,\n"
-"\t\ta package index and a wiki. As a registry it acts like"
-msgstr ""
-
-#: ckan/templates/home/about.html:24
-msgid "freshmeat"
-msgstr ""
-
-#: ckan/templates/home/about.html:24
-msgid ""
-"but for open data and\n"
+"\t\ta package index and a wiki. As a registry it acts like [1:freshmeat] but "
+"for open data and\n"
 "\t\tcontent resources. However it adds to a simple registry in key ways."
 msgstr ""
 
-#: ckan/templates/home/about.html:27
-msgid "First, thanks to its underlying"
-msgstr ""
-
-#: ckan/templates/home/about.html:28
-msgid "versioned domain model"
-msgstr ""
-
 #: ckan/templates/home/about.html:28
 msgid ""
-"CKAN has a\n"
+"First, thanks to its underlying [1:versioned domain model] CKAN has a\n"
 "\t\twiki-like interface that lets anyone add and material held in it. Second,"
 "\n"
 "\t\tand unlike a wiki, CKAN can store 'structured' information, which allows "
 "it\n"
 "\t\tto provide 'index'-like features such as automated registration, "
 "discovery\n"
-"\t\tand installation of material. In this respect it behaves like"
+"\t\tand installation of material. In this respect it behaves like [2:CPAN] or"
+" [3:PyPI] in the software world -- though\n"
+"\t\tagain for [4:open data and content]\n"
+"\t\tnot code."
 msgstr ""
 
-#: ckan/templates/home/about.html:33
-msgid "CPAN"
+#: ckan/templates/home/about.html:39
+msgid ""
+"More about CKAN, and the background to its creation can\n"
+"    be found in [1:these\n"
+"      slides]."
 msgstr ""
 
-#: ckan/templates/home/about.html:33
-msgid "or"
-msgstr ""
-
-#: ckan/templates/home/about.html:34
-msgid "PyPI"
-msgstr ""
-
-#: ckan/templates/home/about.html:34
-msgid ""
-"in the software world -- though\n"
-"\t\tagain for"
-msgstr ""
-
-#: ckan/templates/home/about.html:35
-msgid "open data and content"
-msgstr ""
-
-#: ckan/templates/home/about.html:35
-msgid "not code."
-msgstr ""
-
-#: ckan/templates/home/about.html:38
-msgid ""
-"More about CKAN, and the background to its creation can\n"
-"    be found in"
-msgstr ""
-
-#: ckan/templates/home/about.html:40
-msgid ""
-"these\n"
-"      slides"
-msgstr ""
-
-#: ckan/templates/home/about.html:43
+#: ckan/templates/home/about.html:44
 msgid "Who's Behind CKAN?"
 msgstr ""
 
-#: ckan/templates/home/about.html:45
-msgid "The CKAN software and site is developed and maintained by the"
-msgstr ""
-
 #: ckan/templates/home/about.html:46
 msgid ""
-". Both the\n"
-"    CKAN code and data are open:"
-msgstr ""
-
-#: ckan/templates/home/about.html:47
-msgid ""
-"free for anyone to use\n"
-"      and reuse"
-msgstr ""
-
-#: ckan/templates/home/about.html:48
-msgid ". To find out more check out the the"
-msgstr ""
-
-#: ckan/templates/home/about.html:49
-msgid "CKAN project page"
-msgstr ""
-
-#: ckan/templates/home/about.html:49
-msgid ""
-"on the Open\n"
+"The CKAN software and site is developed and maintained by the [1:Open "
+"Knowledge Foundation]. Both the\n"
+"    CKAN code and data are open: [2:free for anyone to use\n"
+"      and reuse]. To find out more check out the the [3:CKAN project page] on"
+" the Open\n"
 "    Knowledge Foundation site."
 msgstr ""
 
-#: ckan/templates/home/about.html:52
+#: ckan/templates/home/about.html:53
 msgid "Contributors"
 msgstr ""
 
-#: ckan/templates/home/about.html:54
+#: ckan/templates/home/about.html:55
 msgid ""
 "Various people and projects have contributed to the development of CKAN "
 "including:"
 msgstr ""
 
-#: ckan/templates/home/about.html:56
+#: ckan/templates/home/about.html:57
 msgid "Rufus Pollock"
 msgstr ""
 
-#: ckan/templates/home/about.html:57
+#: ckan/templates/home/about.html:58
 msgid "David Read"
 msgstr ""
 
-#: ckan/templates/home/about.html:58
+#: ckan/templates/home/about.html:59
 msgid "Nick Stenning"
 msgstr ""
 
-#: ckan/templates/home/about.html:58
+#: ckan/templates/home/about.html:59
 msgid "(css and js)"
 msgstr ""
 
-#: ckan/templates/home/about.html:59
+#: ckan/templates/home/about.html:60
 msgid "John Bywater"
 msgstr ""
 
-#: ckan/templates/home/about.html:60
+#: ckan/templates/home/about.html:61
 msgid "CKAN logo: \""
 msgstr ""
 
-#: ckan/templates/home/about.html:60
+#: ckan/templates/home/about.html:61
 msgid "angry"
 msgstr ""
 
-#: ckan/templates/home/about.html:60
+#: ckan/templates/home/about.html:61
 msgid "hamster"
 msgstr ""
 
-#: ckan/templates/home/about.html:61
+#: ckan/templates/home/about.html:62
 msgid "famfamfam.com for silk icons"
 msgstr ""
 
-#: ckan/templates/home/about.html:62
+#: ckan/templates/home/about.html:63
 msgid "Pylons"
 msgstr ""
 
-#: ckan/templates/home/about.html:63
+#: ckan/templates/home/about.html:64
 msgid "Genshi"
 msgstr ""
 
-#: ckan/templates/home/index.html:42
+#: ckan/templates/home/index.html:43
 msgid ""
 "Find out more about CKAN by reading our about pages or consulting the \n"
 "        CKAN guide."
 msgstr ""
 
-#: ckan/templates/home/index.html:47 ckan/templates/home/layout.html:9
+#: ckan/templates/home/index.html:48 ckan/templates/home/layout.html:9
 #: ckan/templates/user/read.html:18
 msgid "About"
 msgstr ""
 
-#: ckan/templates/home/index.html:48
+#: ckan/templates/home/index.html:49
 msgid "User Guide"
 msgstr ""
 
-#: ckan/templates/home/index.html:49 ckan/templates/home/layout.html:10
-#: ckan/templates/home/stats.html:12
+#: ckan/templates/home/index.html:50 ckan/templates/home/layout.html:10
+#: ckan/templates/home/stats.html:13
 msgid "Statistics"
 msgstr ""
 
-#: ckan/templates/home/index.html:50
+#: ckan/templates/home/index.html:51
 msgid "Development"
 msgstr ""
 
-#: ckan/templates/home/index.html:56
+#: ckan/templates/home/index.html:57
 msgid "Welcome to CKAN"
 msgstr ""
 
-#: ckan/templates/home/index.html:57
-msgid "CKAN is a registry of"
-msgstr ""
-
 #: ckan/templates/home/index.html:58
 msgid ""
-"open data \n"
-"      and content"
-msgstr ""
-
-#: ckan/templates/home/index.html:59
-msgid "packages. CKAN makes it easy to"
-msgstr ""
-
-#: ckan/templates/home/index.html:59
-msgid ""
-"find, share and reuse \n"
-"      open content and data"
-msgstr ""
-
-#: ckan/templates/home/index.html:60
-msgid ""
-", especially in ways that are machine \n"
+"CKAN is a registry of [1:open data \n"
+"      and content] packages. CKAN makes it easy to [2:find, share and reuse \n"
+"      open content and data], especially in ways that are machine \n"
 "      automatable."
 msgstr ""
 
-#: ckan/templates/home/index.html:64
-msgid "registered packages"
+#: ckan/templates/home/index.html:65
+#, python-format
+msgid "[1:%(package_count)s registered packages] available."
 msgstr ""
 
-#: ckan/templates/home/index.html:64
-msgid "available."
-msgstr ""
-
-#: ckan/templates/home/index.html:68 ckan/templates/home/stats.html:93
+#: ckan/templates/home/index.html:69 ckan/templates/home/stats.html:94
 msgid "Top Tags"
 msgstr ""
 
-#: ckan/templates/home/index.html:78
+#: ckan/templates/home/index.html:79
 msgid "Recently changed"
 msgstr ""
 
-#: ckan/templates/home/index.html:83
+#: ckan/templates/home/index.html:84
 msgid "Time"
 msgstr ""
 
-#: ckan/templates/home/index.html:97
+#: ckan/templates/home/index.html:98
 msgid "View older changes »"
 msgstr ""
 
-#: ckan/templates/home/license.html:7
+#: ckan/templates/home/license.html:8
 msgid "CKAN License"
 msgstr ""
 
-#: ckan/templates/home/license.html:9
+#: ckan/templates/home/license.html:10
 msgid "Code"
 msgstr ""
 
-#: ckan/templates/home/license.html:10
-msgid "The code that runs CKAN is open-source and licensed under the"
-msgstr ""
-
-#: ckan/templates/home/license.html:12
-msgid "GNU Affero GPL"
-msgstr ""
-
-#: ckan/templates/home/license.html:13
-msgid ". It is hosted on"
-msgstr ""
-
-#: ckan/templates/home/license.html:14
-msgid "KnowledgeForge"
-msgstr ""
-
-#: ckan/templates/home/license.html:14
+#: ckan/templates/home/license.html:11
 msgid ""
-", and the project\n"
-"    home page is here:"
-msgstr ""
-
-#: ckan/templates/home/license.html:16
-msgid "http://knowledgeforge.net/project/ckan/"
-msgstr ""
-
-#: ckan/templates/home/license.html:19
-msgid "Content and Data"
+"The code that runs CKAN is open-source and licensed under the [1:GNU Affero "
+"GPL\n"
+"      ]. It is hosted on [2:KnowledgeForge], and the project\n"
+"    home page is here:[3:http://knowledgeforge.net/project/ckan/]."
 msgstr ""
 
 #: ckan/templates/home/license.html:20
-msgid "All material on this site is"
-msgstr ""
-
-#: ckan/templates/home/license.html:21
-msgid "open"
+msgid "Content and Data"
 msgstr ""
 
 #: ckan/templates/home/license.html:21
 msgid ""
-"and can be freely used, reused\n"
-"    and redistributed. Formally, the data/database is licensed under the"
+"All material on this site is [1:open] and can be freely used, reused\n"
+"    and redistributed. Formally, the data/database is licensed under the "
+"[2:Open Data Commons Open\n"
+"      Database License v1.0], with all copyrightable content in that\n"
+"    database plus any additional content on this site licensed under a "
+"[3:Creative Commons\n"
+"      Attribution Share-Alike v3.0 license]."
 msgstr ""
 
-#: ckan/templates/home/license.html:23
-msgid ""
-"Open Data Commons Open\n"
-"      Database License v1.0"
-msgstr ""
-
-#: ckan/templates/home/license.html:24
-msgid ""
-", with all copyrightable content in that\n"
-"    database plus any additional content on this site licensed under a"
-msgstr ""
-
-#: ckan/templates/home/license.html:26
-msgid ""
-"Creative Commons\n"
-"      Attribution Share-Alike v3.0 license"
-msgstr ""
-
-#: ckan/templates/home/license.html:28
+#: ckan/templates/home/license.html:29
 msgid ""
 "For convenience, all material - including all package, tag and revision "
 "information - is available in bulk, in the form of a full dump of the CKAN "
 "database. This (gzipped) dump file is updated daily and can be downloaded "
-"from"
+"from [1:http://www.ckan.net/dump/]."
 msgstr ""
 
-#: ckan/templates/home/license.html:29
-msgid "http://www.ckan.net/dump/"
-msgstr ""
-
-#: ckan/templates/home/stats.html:4
+#: ckan/templates/home/stats.html:5
 msgid "Stats"
 msgstr ""
 
-#: ckan/templates/home/stats.html:14
+#: ckan/templates/home/stats.html:15
 msgid "Total number of packages"
 msgstr ""
 
-#: ckan/templates/home/stats.html:33
+#: ckan/templates/home/stats.html:34
 msgid "Revisions to packages per week"
 msgstr ""
 
-#: ckan/templates/home/stats.html:69
+#: ckan/templates/home/stats.html:70
 msgid "Top Rated Packages"
 msgstr ""
 
-#: ckan/templates/home/stats.html:71 ckan/templates/home/stats.html:79
+#: ckan/templates/home/stats.html:72 ckan/templates/home/stats.html:80
 msgid "Package"
 msgstr ""
 
-#: ckan/templates/home/stats.html:71
+#: ckan/templates/home/stats.html:72
 msgid "Average rating"
 msgstr ""
 
-#: ckan/templates/home/stats.html:71
+#: ckan/templates/home/stats.html:72
 msgid "Number of ratings"
 msgstr ""
 
-#: ckan/templates/home/stats.html:77
+#: ckan/templates/home/stats.html:78
 msgid "Most Edited Packages"
 msgstr ""
 
-#: ckan/templates/home/stats.html:79
+#: ckan/templates/home/stats.html:80
 msgid "Number of edits"
 msgstr ""
 
-#: ckan/templates/home/stats.html:85
+#: ckan/templates/home/stats.html:86
 msgid "Largest Groups"
 msgstr ""
 
-#: ckan/templates/home/stats.html:87
+#: ckan/templates/home/stats.html:88
 msgid "Group"
 msgstr ""
 
-#: ckan/templates/home/stats.html:87
+#: ckan/templates/home/stats.html:88
 msgid "Number of packages"
 msgstr ""
 
-#: ckan/templates/home/stats.html:100
+#: ckan/templates/home/stats.html:101
 msgid "Users owning most packages"
 msgstr ""
 
-#: ckan/templates/home/stats.html:107
+#: ckan/templates/home/stats.html:108
 msgid "Page last updated:"
 msgstr ""
 
 msgid "Authorization for package:"
 msgstr ""
 
-#: ckan/templates/package/edit.html:4
+#: ckan/templates/package/edit.html:5
 msgid "Packages - Edit -"
 msgstr ""
 
-#: ckan/templates/package/edit.html:19
+#: ckan/templates/package/edit.html:20
 msgid "Edit package:"
 msgstr ""
 
-#: ckan/templates/package/edit.html:21 ckan/templates/package/new.html:20
-#: ckan/templates/user/edit.html:9
+#: ckan/templates/package/edit.html:22 ckan/templates/package/new.html:21
+#: ckan/templates/user/edit.html:10
 msgid "(skip to preview)"
 msgstr ""
 
-#: ckan/templates/package/edit.html:28 ckan/templates/package/new.html:31
-#: ckan/templates/user/edit.html:29
+#: ckan/templates/package/edit.html:29 ckan/templates/package/new.html:32
+#: ckan/templates/user/edit.html:30
 msgid "Preview"
 msgstr ""
 
-#: ckan/templates/package/edit.html:36 ckan/templates/package/history.html:49
-#: ckan/templates/package/read.html:130
+#: ckan/templates/package/edit.html:37 ckan/templates/package/history.html:49
+#: ckan/templates/package/read.html:131
 msgid "Package History"
 msgstr ""
 
-#: ckan/templates/package/edit_form.html:12
+#: ckan/templates/package/edit_form.html:13
 msgid "Optional log message about this change:"
 msgstr ""
 
-#: ckan/templates/package/edit_form.html:14 ckan/templates/user/edit.html:18
-msgid "You can use"
+#: ckan/templates/package/edit_form.html:15 ckan/templates/user/edit.html:19
+msgid "You can use [1:Markdown formatting] here."
 msgstr ""
 
-#: ckan/templates/package/edit_form.html:14 ckan/templates/user/edit.html:18
-msgid "Markdown formatting"
-msgstr ""
-
-#: ckan/templates/package/edit_form.html:14 ckan/templates/user/edit.html:18
-msgid "here."
-msgstr ""
-
-#: ckan/templates/package/edit_form.html:16 ckan/templates/revision/read.html:11
+#: ckan/templates/package/edit_form.html:17 ckan/templates/revision/read.html:11
 msgid "Author:"
 msgstr ""
 
-#: ckan/templates/package/edit_form.html:17
-msgid "If you have not signed in this will just be your IP address."
+#: ckan/templates/package/edit_form.html:18
+msgid ""
+"If you have not signed in this will just be your IP address.[1:]\n"
+"      [2:Click here to sign in] before submitting (opens in new window)."
 msgstr ""
 
-#: ckan/templates/package/edit_form.html:19
-msgid "Click here to sign in"
-msgstr ""
-
-#: ckan/templates/package/edit_form.html:19
-msgid "before submitting (opens in new window)."
-msgstr ""
-
-#: ckan/templates/package/edit_form.html:24 ckan/templates/user/edit.html:22
+#: ckan/templates/package/edit_form.html:25 ckan/templates/user/edit.html:23
 msgid "Commit"
 msgstr ""
 
-#: ckan/templates/package/edit_form.html:27
+#: ckan/templates/package/edit_form.html:28
 msgid "Please Note:"
 msgstr ""
 
-#: ckan/templates/package/edit_form.html:29
+#: ckan/templates/package/edit_form.html:30
 msgid ""
 "By submitting content, you agree to release your contributions\n"
 "        under the open license specified on the"
 msgstr ""
 
 #: ckan/templates/package/edit_form.html:31
+msgid "license page"
+msgstr ""
+
+#: ckan/templates/package/edit_form.html:32
 msgid "(basically Attribution-ShareAlike)."
 msgstr ""
 
-#: ckan/templates/package/edit_form.html:32
+#: ckan/templates/package/edit_form.html:33
 msgid ""
 "If you are not happy for this to occur please refrain from editing\n"
 "        this page."
 msgid "Revisions"
 msgstr ""
 
-#: ckan/templates/package/history.html:19 ckan/templates/package/new.html:23
+#: ckan/templates/package/history.html:19 ckan/templates/package/new.html:24
 msgid "Error:"
 msgstr ""
 
 msgid "Compare »"
 msgstr ""
 
-#: ckan/templates/package/index.html:4
+#: ckan/templates/package/index.html:5
 msgid "Packages - Index"
 msgstr ""
 
-#: ckan/templates/package/index.html:13
-msgid "packages."
+#: ckan/templates/package/index.html:14
+#, python-format
+msgid "There are [1:%(package_count)s] packages."
+msgstr ""
+
+#: ckan/templates/package/index.html:17
+msgid "Browse packages"
+msgstr ""
+
+#: ckan/templates/package/index.html:21
+msgid "Register a new package"
 msgstr ""
 
 #: ckan/templates/package/layout.html:10
 msgid "Register new package"
 msgstr ""
 
-#: ckan/templates/package/list.html:4
+#: ckan/templates/package/list.html:5
 msgid "Packages - List"
 msgstr ""
 
-#: ckan/templates/package/list.html:8
+#: ckan/templates/package/list.html:9
 msgid "Package listing key"
 msgstr ""
 
-#: ckan/templates/package/list.html:11
+#: ckan/templates/package/list.html:12
 msgid "Openly licensed"
 msgstr ""
 
-#: ckan/templates/package/list.html:13
+#: ckan/templates/package/list.html:14
 msgid "Closed/unknown licensing"
 msgstr ""
 
-#: ckan/templates/package/list.html:15
+#: ckan/templates/package/list.html:16
 msgid "Resources available"
 msgstr ""
 
-#: ckan/templates/package/list.html:16
+#: ckan/templates/package/list.html:17
 msgid "Click on the arrow to show the package resources."
 msgstr ""
 
-#: ckan/templates/package/list.html:18
+#: ckan/templates/package/list.html:19
 msgid "No resources listed"
 msgstr ""
 
-#: ckan/templates/package/list.html:21
-msgid "Packages with a blue stripe satisfy the OKFN's"
+#: ckan/templates/package/list.html:22
+msgid ""
+"Packages with a blue stripe satisfy the OKFN's \n"
+"        [1:Open Knowledge Definition.]"
 msgstr ""
 
-#: ckan/templates/package/list.html:23
-msgid "Open Knowledge Definition."
-msgstr ""
-
-#: ckan/templates/package/new.html:4
+#: ckan/templates/package/new.html:5
 msgid "Packages - New"
 msgstr ""
 
-#: ckan/templates/package/new.html:19
+#: ckan/templates/package/new.html:20
 msgid "Register a New Package"
 msgstr ""
 
-#: ckan/templates/package/read.html:4
+#: ckan/templates/package/read.html:5
 msgid "Packages -"
 msgstr ""
 
-#: ckan/templates/package/read.html:21 ckan/templates/package/read.html:59
+#: ckan/templates/package/read.html:16
+#, python-format
+msgid "Version [1:%(pkg_version)s]"
+msgstr ""
+
+#: ckan/templates/package/read.html:22 ckan/templates/package/read.html:60
 msgid "License not given"
 msgstr ""
 
-#: ckan/templates/package/read.html:29
+#: ckan/templates/package/read.html:27
+msgid "Downloadable resources"
+msgstr ""
+
+#: ckan/templates/package/read.html:27
+msgid "No resources"
+msgstr ""
+
+#: ckan/templates/package/read.html:30
 msgid "Related packages"
 msgstr ""
 
-#: ckan/templates/package/read.html:40
+#: ckan/templates/package/read.html:41
 msgid "Openness:"
 msgstr ""
 
-#: ckan/templates/package/read.html:42
+#: ckan/templates/package/read.html:43
 msgid "OPEN"
 msgstr ""
 
-#: ckan/templates/package/read.html:45
+#: ckan/templates/package/read.html:46
 msgid "NOT OPEN"
 msgstr ""
 
-#: ckan/templates/package/read.html:51
+#: ckan/templates/package/read.html:52
 msgid "This package is licensed with"
 msgstr ""
 
-#: ckan/templates/package/read.html:66 ckan/templates/package/read.html:70
+#: ckan/templates/package/read.html:67 ckan/templates/package/read.html:71
 msgid "This package satisfies the Open Knowledge Definition."
 msgstr ""
 
-#: ckan/templates/package/read.html:69
+#: ckan/templates/package/read.html:70
 msgid "[Open Data]"
 msgstr ""
 
-#: ckan/templates/package/read.html:73
+#: ckan/templates/package/read.html:74
 msgid "[Open Content]"
 msgstr ""
 
-#: ckan/templates/package/read.html:76
+#: ckan/templates/package/read.html:77
 msgid "Help Make This Package Open!"
 msgstr ""
 
-#: ckan/templates/package/read.html:77
-msgid "This package is"
+#: ckan/templates/package/read.html:78
+msgid ""
+"This package is [1:not open] as it is\n"
+"      [2:not openly licensed] or is\n"
+"      [3:missing downloadable resources]. Help\n"
+"      make it open by \n"
+"        [4:starting an enquiry]\n"
+"        using the\n"
+"        [5:Is It Open\n"
+"          Data service]."
 msgstr ""
 
-#: ckan/templates/package/read.html:77
-msgid "not open"
-msgstr ""
-
-#: ckan/templates/package/read.html:77
-msgid "as it is"
-msgstr ""
-
-#: ckan/templates/package/read.html:78
-msgid "not openly licensed"
-msgstr ""
-
-#: ckan/templates/package/read.html:78
-msgid "or is"
-msgstr ""
-
-#: ckan/templates/package/read.html:79
-msgid "missing downloadable resources"
-msgstr ""
-
-#: ckan/templates/package/read.html:79
-msgid ""
-". Help\n"
-"      make it open by"
-msgstr ""
-
-#: ckan/templates/package/read.html:81
-msgid "starting an enquiry"
-msgstr ""
-
-#: ckan/templates/package/read.html:81
-msgid "using the"
-msgstr ""
-
-#: ckan/templates/package/read.html:83
-msgid ""
-"Is It Open\n"
-"          Data service"
-msgstr ""
-
-#: ckan/templates/package/read.html:91
+#: ckan/templates/package/read.html:92
 msgid "Edit this Package"
 msgstr ""
 
-#: ckan/templates/package/read.html:92
+#: ckan/templates/package/read.html:93
 msgid ""
 "Can you help us keep this page up to date?\n"
-"          If so, why not"
+"          If so, why not\n"
+"          [1:\n"
+"            update the package information]."
 msgstr ""
 
-#: ckan/templates/package/read.html:95
-msgid "update the package information"
-msgstr ""
-
-#: ckan/templates/package/read.html:103
+#: ckan/templates/package/read.html:104
 msgid "Alternative metadata formats"
 msgstr ""
 
-#: ckan/templates/package/read.html:107
+#: ckan/templates/package/read.html:108
 msgid "JSON format"
 msgstr ""
 
-#: ckan/templates/package/read.html:107
+#: ckan/templates/package/read.html:108
 msgid "JSON"
 msgstr ""
 
-#: ckan/templates/package/read.html:111
+#: ckan/templates/package/read.html:112
 msgid "RDF format"
 msgstr ""
 
-#: ckan/templates/package/read.html:111
+#: ckan/templates/package/read.html:112
 msgid "RDF"
 msgstr ""
 
-#: ckan/templates/package/read.html:125
+#: ckan/templates/package/read.html:126
 msgid "RDF Version"
 msgstr ""
 
 msgid "Someresources"
 msgstr ""
 
-#: ckan/templates/package/search.html:6
+#: ckan/templates/package/search.html:7
 msgid "Packages - Search"
 msgstr ""
 
-#: ckan/templates/package/search.html:9
+#: ckan/templates/package/search.html:10
 msgid "Search packages"
 msgstr ""
 
-#: ckan/templates/package/search.html:17
-msgid "tags found (max"
+#: ckan/templates/package/search.html:18
+#, python-format
+msgid "[1:%(tags_count)s] tags found (max %(tags_limit)s shown)."
 msgstr ""
 
-#: ckan/templates/package/search.html:17
-msgid "shown)."
+#: ckan/templates/package/search.html:22
+#, python-format
+msgid "[1:%(item_count)s] packages found."
 msgstr ""
 
-#: ckan/templates/package/search.html:21
-msgid "packages found."
-msgstr ""
-
-#: ckan/templates/package/search.html:23
-msgid "Would you like to"
-msgstr ""
-
-#: ckan/templates/package/search.html:23
-msgid "create a new package?"
+#: ckan/templates/package/search.html:24
+msgid "Would you like to [1:create a new package?]"
 msgstr ""
 
 #: ckan/templates/package/search_form.html:3
 msgid "Filters:"
 msgstr ""
 
+#: ckan/templates/package/search_form.html:7
+msgid "open license"
+msgstr ""
+
 #: ckan/templates/package/search_form.html:8
 msgid "downloadable"
 msgstr ""
 
+#: ckan/templates/revision/common.html:22
+msgid "Purge"
+msgstr ""
+
+#: ckan/templates/revision/common.html:22
+msgid "Are you sure?"
+msgstr ""
+
 #: ckan/templates/revision/diff.html:4
 msgid "Diff"
 msgstr ""
 "      Tag -"
 msgstr ""
 
-#: ckan/templates/tag/index.html:4
+#: ckan/templates/tag/index.html:5
 msgid "Tags - Index"
 msgstr ""
 
-#: ckan/templates/tag/index.html:19
+#: ckan/templates/tag/index.html:19 ckan/templates/tag/index.html:22
+msgid "There are"
+msgstr ""
+
+#: ckan/templates/tag/index.html:20
 msgid "results for ‘"
 msgstr ""
 
-#: ckan/templates/tag/index.html:22
+#: ckan/templates/tag/index.html:23
 msgid "results for tags."
 msgstr ""
 
-#: ckan/templates/tag/index.html:32
+#: ckan/templates/tag/index.html:33
+msgid "Clear search"
+msgstr ""
+
+#: ckan/templates/tag/index.html:33
 msgid "and see all tags."
 msgstr ""
 
-#: ckan/templates/tag/read.html:4
+#: ckan/templates/tag/read.html:5
 msgid "Tags -"
 msgstr ""
 
-#: ckan/templates/tag/read.html:7
+#: ckan/templates/tag/read.html:8
 msgid "Tag:"
 msgstr ""
 
-#: ckan/templates/tag/read.html:8
-msgid "packages tagged with"
+#: ckan/templates/tag/read.html:9
+#, python-format
+msgid "There are %(package_count)s packages tagged with [1:%(tagname)s]:"
 msgstr ""
 
 #: ckan/templates/user/apikey.html:4 ckan/templates/user/login_form.html:4
-#: ckan/templates/user/openid_form.html:17
+#: ckan/templates/user/openid_form.html:18
 msgid "Account - Login"
 msgstr ""
 
 msgid "Your API key is:"
 msgstr ""
 
-#: ckan/templates/user/edit.html:4
+#: ckan/templates/user/edit.html:5
 msgid "User - Edit -"
 msgstr ""
 
-#: ckan/templates/user/edit.html:7
+#: ckan/templates/user/edit.html:8
 msgid "Edit User:"
 msgstr ""
 
-#: ckan/templates/user/edit.html:17
+#: ckan/templates/user/edit.html:18
 msgid "About user:"
 msgstr ""
 
-#: ckan/templates/user/login_form.html:7 ckan/templates/user/openid_form.html:20
+#: ckan/templates/user/login_form.html:7 ckan/templates/user/openid_form.html:21
 msgid "Login"
 msgstr ""
 
 msgid "Account - Logout"
 msgstr ""
 
+#: ckan/templates/user/logout.html:7
+msgid "Logout"
+msgstr ""
+
 #: ckan/templates/user/logout.html:8
 msgid "You have logged out successfully."
 msgstr ""
 
-#: ckan/templates/user/openid_form.html:26
+#: ckan/templates/user/openid_form.html:27
 msgid "Login to CKAN using Open ID"
 msgstr ""
 
-#: ckan/templates/user/openid_form.html:28
+#: ckan/templates/user/openid_form.html:29
 msgid "Please click your account provider:"
 msgstr ""
 
-#: ckan/templates/user/openid_form.html:36
+#: ckan/templates/user/openid_form.html:37
 msgid ""
 "OpenID is service that allows you to log-on to many different websites using "
 "a single identity.\n"
-"    Find out"
+"    Find out [1:more about OpenID] and [2:how to get an OpenID enabled "
+"account]."
 msgstr ""
 
-#: ckan/templates/user/openid_form.html:37
-msgid "more about OpenID"
-msgstr ""
-
-#: ckan/templates/user/openid_form.html:37 ckan/templates/user/openid_form.html:46
-msgid "and"
-msgstr ""
-
-#: ckan/templates/user/openid_form.html:37
-msgid "how to get an OpenID enabled account"
-msgstr ""
-
-#: ckan/templates/user/openid_form.html:42
+#: ckan/templates/user/openid_form.html:43
 msgid "Don't have an OpenID?"
 msgstr ""
 
-#: ckan/templates/user/openid_form.html:43
+#: ckan/templates/user/openid_form.html:44
 msgid ""
 "OpenID is service that allows you to log-on to many different websites\n"
-"      using a single indentity. Find out"
-msgstr ""
-
-#: ckan/templates/user/openid_form.html:45
-msgid ""
-"more\n"
-"      about OpenID"
-msgstr ""
-
-#: ckan/templates/user/openid_form.html:46
-msgid ""
-"how to get an\n"
-"      OpenID enabled account"
-msgstr ""
-
-#: ckan/templates/user/openid_form.html:47
-msgid ""
-". Probably the simplest way is sign up with a\n"
-"      free OpenID provider such as"
-msgstr ""
-
-#: ckan/templates/user/openid_form.html:49
-msgid "https://www.myopenid.com/"
+"      using a single indentity. Find out [1:more\n"
+"      about OpenID] and [2:how to get an\n"
+"      OpenID enabled account]. Probably the simplest way is sign up with a\n"
+"      free OpenID provider such as [3:https://www.myopenid.com/]."
 msgstr ""
 
 #: ckan/templates/user/read.html:6 ckan/templates/user/read.html:10

ckan/i18n/fr/LC_MESSAGES/ckan.po

 "Project-Id-Version: ckan 0.11a\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2009-12-30 13:31+0000\n"
-"PO-Revision-Date: 2010-05-25 23:06+0200\n"
+"PO-Revision-Date: 2010-05-30 21:17+0200\n"
 "Last-Translator: Benjamin Ooghe-Tabanou <b.ooghe@gmail.com>\n"
 "Language-Team: fr <LL@li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.4\n"
 
-#: ckan/controllers/group.py:31
+#: ckan/controllers/group.py:30
 #, python-format
 msgid "Not authorized to read %s"
 msgstr "Non-autorisé à lire %s"
 
-#: ckan/controllers/group.py:54
+#: ckan/controllers/group.py:53
 msgid "Must be logged in to create a new group."
 msgstr "Vous devez être connecté pour créer un nouveau groupe"
 
-#: ckan/controllers/group.py:102
+#: ckan/controllers/group.py:101
 #, python-format
 msgid "User %r not authorized to edit %r"
 msgstr "L'utilisateur %r n'est pas autorisé à éditer %r"
 
-#: ckan/controllers/group.py:140
+#: ckan/controllers/group.py:139
 msgid "Group not found"
 msgstr "Groupe introuvable"
 
-#: ckan/controllers/group.py:145
+#: ckan/controllers/group.py:144
 #, fuzzy
 msgid "Not authorized to edit authization for group"
 msgstr "Vous n'êtes pas autorisé à éditer les droits pour le groupe"
 
-#: ckan/controllers/group.py:172 ckan/controllers/package.py:328
+#: ckan/controllers/group.py:171 ckan/controllers/package.py:327
 #, python-format
 msgid "Added role '%s' for user '%s'"
 msgstr "Rôle '%s' ajouté pour l'utilisateur '%s'"
 
-#: ckan/controllers/group.py:179 ckan/controllers/package.py:335
+#: ckan/controllers/group.py:178 ckan/controllers/package.py:334
 msgid "Error: No role found with that id"
 msgstr "Erreur : Aucun rôle trouvé pour cette id"
 
-#: ckan/controllers/group.py:182 ckan/controllers/package.py:337
+#: ckan/controllers/group.py:181 ckan/controllers/package.py:336
 #, python-format
 msgid "Deleted role '%s' for user '%s'"
 msgstr "Rôle '%s' supprimé pour l'utilisateur '%s'"
 msgid "User %r unauthorized to edit existing package %s"
 msgstr "L'utilisateur %r n'est pas autorisé à éditer le paquet %s"
 
-#: ckan/controllers/package.py:76 ckan/controllers/package.py:112
-#: ckan/controllers/package.py:297
+#: ckan/controllers/package.py:75 ckan/controllers/package.py:111
+#: ckan/controllers/package.py:296
 msgid "Package not found"
 msgstr "Paquet introuvable"
 
-#: ckan/controllers/package.py:87
+#: ckan/controllers/package.py:86
 #, python-format
 msgid "Unauthorized to read package %s"
 msgstr "Lecture du paquet %s non-autorisée"
 
-#: ckan/controllers/package.py:106
+#: ckan/controllers/package.py:105
 msgid "Select two revisions before doing the comparison."
 msgstr "Sélectionner deux révisions avant de comparer."
 
-#: ckan/controllers/package.py:118
+#: ckan/controllers/package.py:117
 msgid "CKAN Package Revision History"
 msgstr "Historique des révisions du paquet CKAN"
 
-#: ckan/controllers/package.py:120
+#: ckan/controllers/package.py:119
 msgid "Recent changes to CKAN Package: "
 msgstr ""
 
-#: ckan/controllers/package.py:139
-#, fuzzy, python-format
-#| msgid "%(message)s"
+#: ckan/controllers/package.py:138
+#, fuzzy
 msgid "Log message: "
 msgstr "%(message)s"
 
-#: ckan/controllers/package.py:228
+#: ckan/controllers/package.py:227
 #, python-format
 msgid "User %r not authorized to edit %s"
 msgstr "L'utilisateur %r n'est pas autorisé à éditer %s"
 
-#: ckan/controllers/package.py:302
+#: ckan/controllers/package.py:301
 #, python-format
 msgid "User %r not authorized to edit %s authorizations"
 msgstr "L'utilisateur %r n'est pas autorisé à éditer les droits de %s"
 
-#: ckan/controllers/package.py:353
+#: ckan/controllers/package.py:352
 msgid "404 Package Not Found"
 msgstr "404 Paquet non-trouvé"
 
-#: ckan/controllers/package.py:359
+#: ckan/controllers/package.py:358
 msgid "Rating value invalid"
 msgstr "Note invalide"
 
-#: ckan/controllers/rest.py:132 ckan/controllers/rest.py:223
-#: ckan/controllers/rest.py:299
+#: ckan/controllers/rest.py:141 ckan/controllers/rest.py:232
+#: ckan/controllers/rest.py:308
 msgid "Access denied"
 msgstr "Accès non-autorisé"
 
-#: ckan/controllers/rest.py:137 ckan/controllers/rest.py:229
+#: ckan/controllers/rest.py:146 ckan/controllers/rest.py:238
 #, python-format
 msgid "JSON Error: %s"
 msgstr "Erreur JSON: %s"
 
-#: ckan/controllers/rest.py:159
+#: ckan/controllers/rest.py:168
 #, python-format
 msgid "REST API: Create package relationship: %s %s %s"
 msgstr ""
 
-#: ckan/controllers/rest.py:170
+#: ckan/controllers/rest.py:179
 #, python-format
 msgid "Cannot create new entity of this type: %s %s"
 msgstr "Ne peut créer un nouvel élément de ce type : %s %s"
 
-#: ckan/controllers/rest.py:177
+#: ckan/controllers/rest.py:186
 #, python-format
 msgid "REST API: Create object %s"
 msgstr "REST API: Crée l'object %s"
 
-#: ckan/controllers/rest.py:215
+#: ckan/controllers/rest.py:224
 #, python-format
 msgid "Cannot update entity of this type: %s"
 msgstr "Ne peut modifier un élement de ce type : %s"
 
-#: ckan/controllers/rest.py:248
+#: ckan/controllers/rest.py:257
 #, python-format
 msgid "REST API: Update object %s"
 msgstr "REST API: Met-à-jour l'objet %s"
 
-#: ckan/controllers/rest.py:293
+#: ckan/controllers/rest.py:302
 #, python-format
 msgid "Cannot delete entity of this type: %s %s"
 msgstr "Ne peut supprimer un élément de ce type : %s %s"
 
-#: ckan/controllers/rest.py:304
+#: ckan/controllers/rest.py:313
 #, python-format
 msgid "REST API: Delete %s"
 msgstr ""
 
-#: ckan/controllers/rest.py:334
+#: ckan/controllers/rest.py:349
 msgid "Blank qjson parameter"
 msgstr "Paramètre qjson vide"
 
-#: ckan/controllers/rest.py:343
+#: ckan/controllers/rest.py:358
 #, python-format
 msgid "Search params: %s"
 msgstr "Paramètres de recherche : %s"
 
-#: ckan/controllers/rest.py:371
+#: ckan/controllers/rest.py:386
 msgid "You must supply a package name (parameter \"package\")."
 msgstr "Veuillez proposer un nom de paquet (paramètre \"package\")."
 
-#: ckan/controllers/rest.py:373
+#: ckan/controllers/rest.py:388
 msgid "You must supply a rating (parameter \"rating\")."
 msgstr "Veuillez proposer une note (paramètre \"rating\")."
 
-#: ckan/controllers/rest.py:378
+#: ckan/controllers/rest.py:393
 msgid "Rating must be an integer value."
 msgstr "La note doit être un nombre."
 
-#: ckan/controllers/rest.py:382
+#: ckan/controllers/rest.py:397
 #, python-format
 msgid "Rating must be between %i and %i."
 msgstr "La note doit être comprise entre %i et %i."
 
-#: ckan/controllers/rest.py:384
+#: ckan/controllers/rest.py:399
 #, python-format
 msgid "Package with name %r does not exist."
 msgstr "Le paquet nommé %r n'existe pas."
 
-#: ckan/controllers/rest.py:447
+#: ckan/controllers/rest.py:462
 #, python-format
 msgid "Can't find entity data in request params %s: %s"
 msgstr ""
 
-#: ckan/controllers/rest.py:453
+#: ckan/controllers/rest.py:468
 msgid "Request params must be in form of a json encoded dictionary."
 msgstr ""
 
-#: ckan/controllers/rest.py:482
+#: ckan/controllers/rest.py:497
 #, python-format
 msgid "REST API: Update package relationship: %s %s %s"
 msgstr ""
 
 #: ckan/controllers/revision.py:18
 #, fuzzy
-#| msgid "Repository History"
 msgid "CKAN Repository Revision History"
 msgstr "Historique du dépôt"
 
 msgstr ""
 
 #: ckan/forms/common.py:31
-#, fuzzy, python-format
-#| msgid "Package %s already exists in database. Import will edit the fields."
+#, fuzzy
 msgid "Package name already exists in database"
 msgstr ""
 "Le paquet %s existe déjà dans la base de données. L'import modifiera les "
 msgid "Value does not match required format: %s"
 msgstr ""
 
-#: ckan/forms/common.py:430
+#: ckan/forms/common.py:436
 #, python-format
 msgid "Tag \"%s\" length is less than minimum %s"
 msgstr ""
 
-#: ckan/forms/common.py:432
+#: ckan/forms/common.py:438
 #, python-format
 msgid "Tag \"%s\" must be alphanumeric characters or symbols: -_."
 msgstr ""
 
-#: ckan/forms/common.py:434
+#: ckan/forms/common.py:440
 #, python-format
 msgid "Tag \"%s\" must not be uppercase"
 msgstr ""
 
-#: ckan/forms/common.py:451
+#: ckan/forms/common.py:457
 #, python-format
 msgid "Duplicate key \"%s\""
 msgstr ""
 
-#: ckan/forms/common.py:454
+#: ckan/forms/common.py:460
 #, python-format
 msgid "Extra key-value pair: key is not set for value \"%s\"."
 msgstr ""
 
-#: ckan/forms/common.py:588
+#: ckan/forms/common.py:594
 msgid "other - please specify"
 msgstr ""
 
-#: ckan/forms/common.py:604
+#: ckan/forms/common.py:610
 #, fuzzy
-#| msgid "here."
 msgid "Other"
 msgstr "ici."
 
 #: ckan/forms/package.py:31 ckan/forms/package.py:58
 #: ckan/forms/package_ca.py:42 ckan/forms/package_ca.py:80
 #, fuzzy
-#| msgid "Username:"
 msgid "Name"
 msgstr "Nom d'utilisateur :"
 
 
 #: ckan/forms/package.py:32 ckan/forms/package.py:60
 #: ckan/forms/package_ca.py:48 ckan/forms/package_ca.py:82
-#: ckan/templates/home/license.html:4 ckan/templates/package/read_core.html:71
+#: ckan/templates/home/license.html:5 ckan/templates/package/read_core.html:71
 msgid "License"
 msgstr "Licence"
 
 #: ckan/forms/package.py:33 ckan/forms/package.py:60
 #: ckan/forms/package_ca.py:51 ckan/forms/package_ca.py:82
-#: ckan/templates/layout.html:75 ckan/templates/tag/index.html:7
+#: ckan/templates/layout.html:76 ckan/templates/tag/index.html:8
 msgid "Tags"
 msgstr "Tags"
 
 
 #: ckan/forms/package.py:58 ckan/forms/package_ca.py:80
 #, fuzzy
-#| msgid "No Title"
 msgid "Title"
 msgstr "Sans titre"
 
-#: ckan/forms/package.py:58 ckan/templates/package/read.html:15
+#: ckan/forms/package.py:58
 msgid "Version"
 msgstr "Version"
 
 msgid "URL"
 msgstr "URL"
 
-#: ckan/forms/package.py:59 ckan/templates/home/index.html:82
+#: ckan/forms/package.py:59 ckan/templates/home/index.html:83
 #: ckan/templates/package/history.html:27 ckan/templates/revision/list.html:16
 #: ckan/templates/user/read.html:37
 msgid "Author"
 
 #: ckan/forms/package.py:60
 #, fuzzy
-#| msgid "State:"
 msgid "State"
 msgstr "État"
 
 
 #: ckan/forms/package_ca.py:49
 #, fuzzy
-#| msgid "available."
 msgid "Only if available"
 msgstr "disponibles."
 
 
 #: ckan/forms/package_gov.py:129
 #, fuzzy
-#| msgid "Revision"
 msgid "Precision"
 msgstr "Révision"
 
 msgid "%(message)s"
 msgstr "%(message)s"
 
-#: ckan/templates/layout.html:11
+#: ckan/templates/layout.html:12
 msgid "CKAN - Comprehensive Knowledge Archive Network -"
 msgstr "CKAN - Comprehensive Knowledge Archive Network -"
 
-#: ckan/templates/layout.html:19
+#: ckan/templates/layout.html:20
 msgid "CKAN Recent Changes"
 msgstr "Modifications récentes de CKAN"
 
-#: ckan/templates/layout.html:53
-msgid "Logged in as"
-msgstr "Connecté en tant que"
-
-#: ckan/templates/layout.html:55
-msgid "My account"
-msgstr "Mon compte"
-
-#: ckan/templates/layout.html:56 ckan/templates/user/logout.html:7
-msgid "Logout"
-msgstr "Déconnexion"
+#: ckan/templates/layout.html:54
+#, python-format
+msgid ""
+"Logged in as [1:%(openid_icon)s %(user)s]\n"