From 48274178e18f3f366bec27bf230ad2298a8553d8 Mon Sep 17 00:00:00 2001 From: Arthur Lutz Date: Wed, 30 May 2012 23:05:16 +0200 Subject: [PATCH 01/53] i18n roundup in templates (mainly blogs/ and root templates) --- scanblog/TODO | 5 + scanblog/templates/404.html | 7 +- scanblog/templates/500.html | 9 +- scanblog/templates/_pagination.html | 6 +- scanblog/templates/blogs/_blog_cloud.html | 48 ++-- .../templates/blogs/_inappropriate_post.html | 4 +- .../templates/blogs/_post_bottom_line.html | 4 +- scanblog/templates/blogs/_post_pagegroup.html | 21 +- scanblog/templates/blogs/_post_tag_list.html | 2 +- .../templates/blogs/_post_title_line.html | 118 +++++----- scanblog/templates/blogs/_related.html | 8 +- .../templates/blogs/_sharing_buttons.html | 4 +- .../templates/blogs/all_comments_list.html | 13 +- scanblog/templates/blogs/all_posts_list.html | 4 +- .../templates/blogs/author_post_list.html | 4 +- scanblog/templates/blogs/base.html | 5 +- scanblog/templates/blogs/base_post_list.html | 2 +- .../templates/blogs/blogs_front_page.html | 5 +- scanblog/templates/blogs/delete_post.html | 9 +- scanblog/templates/blogs/edit_post.html | 81 +++---- scanblog/templates/blogs/manage_posts.html | 24 +- scanblog/templates/blogs/org_post_list.html | 4 +- scanblog/templates/blogs/page_picker.html | 212 +++++++++--------- scanblog/templates/blogs/post_detail.html | 125 ++++++----- scanblog/templates/blogs/tag_post_list.html | 8 +- scanblog/templates/home.html | 27 +-- 26 files changed, 412 insertions(+), 347 deletions(-) create mode 100644 scanblog/TODO diff --git a/scanblog/TODO b/scanblog/TODO new file mode 100644 index 0000000..8345043 --- /dev/null +++ b/scanblog/TODO @@ -0,0 +1,5 @@ +* make piwik optionnal & configurable template analytics.html + +* replace ✍ by css class and css display + +* optionnal sharing buttons diff --git a/scanblog/templates/404.html b/scanblog/templates/404.html index a6e3e25..0ba6055 100644 --- a/scanblog/templates/404.html +++ b/scanblog/templates/404.html @@ -1,6 +1,7 @@ +{% load i18n %} {% extends "site_base.html" %} -{% block title %}404 - Not found{% endblock %} +{% block title %}{% trans "404 - Not found" %}{% endblock %} {% block body %} -

404 Not Found

-

Sorry, no page with that address can be found.

+

{% trans "404 Not Found" %}

+

{% trans "Sorry, no page with that address can be found." }

{% endblock %} diff --git a/scanblog/templates/500.html b/scanblog/templates/500.html index 0d7b169..8600b7e 100644 --- a/scanblog/templates/500.html +++ b/scanblog/templates/500.html @@ -1,6 +1,7 @@ -

500 Internal Server Error

-

Sorry, it's not you -- it's us. A server admin has been notified and will -look into fixing this as soon as possible. +{% load i18n %} +

{% trans "500 Internal Server Error" %}

+

{% trans "Sorry, it's not you -- it's us. A server admin has been notified and will +look into fixing this as soon as possible." %}

-

You can return to the front page here: http://betweenthebars.org. +

{% trans "You can return to the front page here: http://betweenthebars.org." %}

diff --git a/scanblog/templates/_pagination.html b/scanblog/templates/_pagination.html index 59d3040..71e6d3e 100644 --- a/scanblog/templates/_pagination.html +++ b/scanblog/templates/_pagination.html @@ -1,12 +1,12 @@ diff --git a/scanblog/templates/blogs/_blog_cloud.html b/scanblog/templates/blogs/_blog_cloud.html index a333e52..2a6981a 100644 --- a/scanblog/templates/blogs/_blog_cloud.html +++ b/scanblog/templates/blogs/_blog_cloud.html @@ -1,15 +1,29 @@
- Categories - Recent posts - Comments - Authors - Every Page + + {% trans "Categories" %} + + + {% trans "Recent posts" %} + + + {% trans "Comments" %} + + + {% trans "Authors" %} + + + {% trans "Every Page" %} +
{% if tag_columns %} -

Posts by category

+

{% trans "Posts by category" %}

{% for column in tag_columns %}
@@ -30,38 +44,44 @@

Posts by category

{% endif %}
-

Recent posts

+

{% trans "Recent posts" %}

-

Recent comments

+

{% trans "Recent comments" %}

-

Authors with recent posts

+

{% trans "Authors with recent posts" %}

diff --git a/scanblog/templates/blogs/_inappropriate_post.html b/scanblog/templates/blogs/_inappropriate_post.html index 020d0f4..75e7a93 100644 --- a/scanblog/templates/blogs/_inappropriate_post.html +++ b/scanblog/templates/blogs/_inappropriate_post.html @@ -9,9 +9,9 @@

{{ post.title }}

{% url profiles.own_profile_edit as edit_profile_url %} - This post contains adult content. + {% trans "This post contains adult content. To view this post, please enable “show adult content” - in your profile. + in your profile." %}

{% include "blogs/_post_bottom_line.html" %} diff --git a/scanblog/templates/blogs/_post_bottom_line.html b/scanblog/templates/blogs/_post_bottom_line.html index ef08a24..695a529 100644 --- a/scanblog/templates/blogs/_post_bottom_line.html +++ b/scanblog/templates/blogs/_post_bottom_line.html @@ -17,9 +17,9 @@ | {% if post.author.profile.blog_name %} - From {{post.author.profile.blog_name}} + {% trans "From" %} {{post.author.profile.blog_name}} {% endif %} - {% trans "by" %} + {% trans "by" %} {{post.author.profile}}{% with org=post.author.organization_set.get %}{% if org.public %}, {% trans "writing for" %} {{ org.name }}{% endif %}{% endwith %} diff --git a/scanblog/templates/blogs/_post_pagegroup.html b/scanblog/templates/blogs/_post_pagegroup.html index 4a46243..15a568c 100644 --- a/scanblog/templates/blogs/_post_pagegroup.html +++ b/scanblog/templates/blogs/_post_pagegroup.html @@ -2,17 +2,22 @@ {% load public_url %} {% for page in documentpages %}
- - - {% trans "page" %} {{ page.page_number }}/{{ documentpage_count }} - + + + {% trans "page" %} {{ page.page_number }}/{{ documentpage_count }} +
- {% trans 'Scanned page' %} + {% trans 'Scanned page' %}
{% if forloop.last and documentpage_count > page.page_number %} - Read more{% if remaining %} ({{ remaining }} more page{{ remaining|pluralize }}){% endif %} + + {% trans "Read more" %} + {% if remaining %} + {# FIXME don't know how to translate remaining w/ pluralize #} + ({{ remaining }} more page{{ remaining|pluralize }}) + {% endif %} + {% endif %} {% endfor %} diff --git a/scanblog/templates/blogs/_post_tag_list.html b/scanblog/templates/blogs/_post_tag_list.html index e849600..74d9219 100644 --- a/scanblog/templates/blogs/_post_tag_list.html +++ b/scanblog/templates/blogs/_post_tag_list.html @@ -1,6 +1,6 @@ {% with post.tags.all as tags %} {% if tags %} - filed under: + {% trans "filed under" %}: {% for tag in tags %} {{ tag.name }}{% if not forloop.last %},{% endif %} {% endfor %} diff --git a/scanblog/templates/blogs/_post_title_line.html b/scanblog/templates/blogs/_post_title_line.html index 0ecf3a6..3535744 100644 --- a/scanblog/templates/blogs/_post_title_line.html +++ b/scanblog/templates/blogs/_post_title_line.html @@ -7,61 +7,73 @@

{{post.title}}

{% endif %} {% if post.status != "published" %}

(unpublished – {{ post.status }})

{% endif %} - +
{% include "blogs/_post_tag_list.html" %}
- {% spaceless %} - {% if comments_open %} - Reply - {% endif %} - {% if perms.scanning.tag_post %} - Tag - {% endif %} -   - {% if post.scan_id %} - {% with tx=post.transcription %} - {% if tx %} - {% if tx.complete %} - ✍ Transcribed - {% else %} - ✍ Partially transcribed - {% endif %} - {% else %} - {% if transcription_open %} - ✍ Add transcription - {% endif %} - {% endif %} - {% endwith %} - {% endif %} - {% if user.profile.blogger and not user.profile.managed and user.pk = post.author.pk %} - Edit - {% endif %} - {% endspaceless %} - {% if perms.scanning.change_scan %} - Edit - {% endif %} - {% if perms.scanning.tag_post %} -
-
- ✖ -
- Tags: -
    - {% for tag in post.tags.all %} -
  • {{ tag.name }}
    • - {% endfor %} -
- - -
- {% endif %} + {% spaceless %} + {% if comments_open %} + Reply + {% endif %} + {% if perms.scanning.tag_post %} + Tag + {% endif %} +   + {% if post.scan_id %} + {% with tx=post.transcription %} + {% if tx %} + {% if tx.complete %} + + ✍ {% trans "Transcribed" %} + + {% else %} + + ✍ {% trans "Partially transcribed" %} + + {% endif %} + {% else %} + {% if transcription_open %} + + ✍ {% trans "Add transcription" %} + + {% endif %} + {% endif %} + {% endwith %} + {% endif %} + {% if user.profile.blogger and not user.profile.managed and user.pk = post.author.pk %} + + {% trans "Edit" %} + + {% endif %} + {% endspaceless %} + {% if perms.scanning.change_scan %} + +
+ ✖ +
+ {% trans "Tags" %}: +
    + {% for tag in post.tags.all %} +
  • {{ tag.name }}
    • + {% endfor %} +
+ + +
+ {% endif %}
diff --git a/scanblog/templates/blogs/_related.html b/scanblog/templates/blogs/_related.html index 348a58b..5d06004 100644 --- a/scanblog/templates/blogs/_related.html +++ b/scanblog/templates/blogs/_related.html @@ -12,9 +12,9 @@

{{ related.title }}

 @@ -26,7 +26,7 @@

{{ related.title }}

{% endfor%} {% if related.more %} {% endif %} diff --git a/scanblog/templates/blogs/_sharing_buttons.html b/scanblog/templates/blogs/_sharing_buttons.html index c71cbc4..25037f7 100644 --- a/scanblog/templates/blogs/_sharing_buttons.html +++ b/scanblog/templates/blogs/_sharing_buttons.html @@ -1,3 +1,3 @@ -  + diff --git a/scanblog/templates/blogs/all_comments_list.html b/scanblog/templates/blogs/all_comments_list.html index 642ee00..4fb2a90 100644 --- a/scanblog/templates/blogs/all_comments_list.html +++ b/scanblog/templates/blogs/all_comments_list.html @@ -5,21 +5,22 @@ {% block title %}Recent comments{% endblock %} {% block body %} -

Recent Comments

+

{% trans "Recent Comments" %}

{% for comment in page.object_list %}
{% include "comments/_comment.html" %} {% with doc=comment.document %} -
Posted on {{ doc.get_title }} by {{ comment.document.author.profile }} +
{% trans "Posted on" %} {{ doc.get_title }} {% trans "by" %} {{ comment.document.author.profile }} {% thumbnail doc.documentpage_set.all.0.image.path "100" as im %} - + {{ doc.get_title }} + alt='{{ doc.get_title }}' style='vertical-align: middle; margin-left: 1em; margin-bottom: 1em;'/> + {% endthumbnail %}
{% endwith %} @@ -28,7 +29,7 @@

Recent Comments

{% if page.paginator.num_pages > 1 %} - More comments: + {% trans "More comments" %}: {% include "_pagination.html" %} {% endif %} diff --git a/scanblog/templates/blogs/all_posts_list.html b/scanblog/templates/blogs/all_posts_list.html index 7ecc0d4..4e33324 100644 --- a/scanblog/templates/blogs/all_posts_list.html +++ b/scanblog/templates/blogs/all_posts_list.html @@ -1,3 +1,3 @@ {% extends "blogs/base_post_list.html" %} -{% block title %}Recent posts{% endblock %} -{% block heading %}

Recent posts from all authors

{% endblock %} +{% block title %}{% trans "Recent posts" %}{% endblock %} +{% block heading %}

{% trans "Recent posts from all authors" %}

{% endblock %} diff --git a/scanblog/templates/blogs/author_post_list.html b/scanblog/templates/blogs/author_post_list.html index 356a4f8..705644d 100644 --- a/scanblog/templates/blogs/author_post_list.html +++ b/scanblog/templates/blogs/author_post_list.html @@ -1,7 +1,7 @@ {% extends "blogs/base_post_list.html" %} {% block title %} {% if author.profile.blog_name %} - {{ author.profile.blog_name }} by {{ author.profile.display_name }} + {{ author.profile.blog_name }} {% trans "by" %} {{ author.profile.display_name }} {% else %} {{ author.profile.display_name }} {% endif %} @@ -9,7 +9,7 @@ {% block heading %} {% if author.profile.blog_name %}

{{ author.profile.blog_name }}

- by {{ author.profile.display_name }} + {% trans "by" %} {{ author.profile.display_name }} {% else %}

{{ author.profile.display_name }}

{% endif %} diff --git a/scanblog/templates/blogs/base.html b/scanblog/templates/blogs/base.html index 0c1ac3a..b4b8890 100644 --- a/scanblog/templates/blogs/base.html +++ b/scanblog/templates/blogs/base.html @@ -1,4 +1,5 @@ {% extends "site_base.html" %} +{% load i18n %} {% block nav_blogs_active %}active{% endblock %} {% block css %} @@ -9,8 +10,8 @@ {% block subnav %} {% if user.profile.blogger and not user.profile.managed %} - ☰ My Blog Posts - ✍ Compose + ☰ {% trans "My Blog Posts" %} + ✍ {% trans "Compose" %} {% endif %} {% include "blogs/_blog_cloud.html" %} {% endblock %} diff --git a/scanblog/templates/blogs/base_post_list.html b/scanblog/templates/blogs/base_post_list.html index a3949eb..6e21e30 100644 --- a/scanblog/templates/blogs/base_post_list.html +++ b/scanblog/templates/blogs/base_post_list.html @@ -20,7 +20,7 @@ {% if page.paginator.num_pages > 1 %} -More posts: +{% trans "More posts" %}: {% include "_pagination.html" %} {% include "blogs/_related.html" %} diff --git a/scanblog/templates/blogs/blogs_front_page.html b/scanblog/templates/blogs/blogs_front_page.html index b01548a..f7b7367 100644 --- a/scanblog/templates/blogs/blogs_front_page.html +++ b/scanblog/templates/blogs/blogs_front_page.html @@ -1,8 +1,9 @@ {% extends "blogs/base_post_list.html" %} -{% block title %}Blogs from writers in prison{% endblock %} +{% load i18n %} +{% block title %}{% trans "Blogs from writers in prison" %}{% endblock %} {% block subnav %} {% with categories_open="open" %}{{ block.super }}{% endwith %} {% endblock %} {% block heading %} -

Recent posts by date

+

{% trans "Recent posts by date" %}

{% endblock %} diff --git a/scanblog/templates/blogs/delete_post.html b/scanblog/templates/blogs/delete_post.html index d143354..613a359 100644 --- a/scanblog/templates/blogs/delete_post.html +++ b/scanblog/templates/blogs/delete_post.html @@ -2,16 +2,17 @@ {% block title %}Delete post?{% endblock %} {% block body %}

- Delete the post {{ post.get_title }} and remove it from the site? - This can't be undone. + {% trans "Delete the post" %} {{ post.get_title }} + {% trans "and remove it from the site?" %} + {% trans "This can't be undone." %}

{% csrf_token %} - +

- Cancel + {% trans "Cancel" %}

{% endblock %} diff --git a/scanblog/templates/blogs/edit_post.html b/scanblog/templates/blogs/edit_post.html index 513ed08..3f640e8 100644 --- a/scanblog/templates/blogs/edit_post.html +++ b/scanblog/templates/blogs/edit_post.html @@ -3,59 +3,64 @@ {% block title %} {% if post.pk %} - Editing post {{ post.get_title }} + {% trans "Editing post" %} {{ post.get_title }} {% else %} - Compose post + {% trans "Compose post" %} {% endif %} {% endblock %} {% block body %}

{% if post.pk %} - Editing post {{ post.get_title }} + {% trans "Editing post" %} {{ post.get_title }} {% else %} - Compose post + {% trans "Compose post" %} {% endif %}

{% if post.scan_id %} -

- Sorry: we're still working on the feature to allow you to edit scans - that were uploaded while you were incarcerated. We're not ready yet! - In the mean time, don't hesitate to write us at - info@betweenthebars.org - and we an make any changes to the posts if you'd like. +

+ {% trans "Sorry: we're still working on the feature to allow you to edit scans + that were uploaded while you were incarcerated. We're not ready yet! + In the mean time, don't hesitate to write us at + info@betweenthebars.org + and we an make any changes to the posts if you'd like." %}

- If you'd like to remove the post, click “Delete post" below. + {% trans "If you'd like to remove the post, click “Delete post“ below." %}

{% else %}
{% csrf_token %} -
{{ page.document.date_written|date:"Y b j" }}
{{ page.document.get_title }} 		- More... + {% trans "More" %}...
- {{ form.as_table }} - - - - - - - -
- (optional) Comma separated list of categories: -
    - {% if post.pk %} - {% for tag in post.tags.all %} -
  • {{ tag.name }}
    • - {% endfor %} - {% endif %} -
-
+ + {{ form.as_table }} + + + + + + + +
+ {% trans "(optional) Comma separated list of categories" %}: +
    + {% if post.pk %} + {% for tag in post.tags.all %} +
  • {{ tag.name }}
    • + {% endfor %} + {% endif %} +
+
+ +
{% endif %} {% if post.pk %}

- Delete post + + {% trans "Delete post" %} + {% endif %} {% endblock %} @@ -63,12 +68,12 @@

{% endblock %} diff --git a/scanblog/templates/blogs/manage_posts.html b/scanblog/templates/blogs/manage_posts.html index 0d2ac86..6e3de40 100644 --- a/scanblog/templates/blogs/manage_posts.html +++ b/scanblog/templates/blogs/manage_posts.html @@ -1,17 +1,17 @@ {% extends "blogs/base.html" %} {% load humanize %} -{% block title %}My posts{% endblock %} +{% block title %}{% trans "My posts" }%{% endblock %} {% block body %} - ✍ Compose new post + ✍ {% trans "Compose new post" %} {% if posts %} - - - - + + + + {% endif %} @@ -21,28 +21,28 @@ {% empty %} - + {% endfor %}
TitleTagsStatusDate{% trans "Title" %}{% trans "Tags" %}{% trans "Status" %}{% trans "Date" %}
{{ post.tags.all|join:", " }} {% if post.status == "unknown" %} - Draft + {% trans "Draft" %} {% endif %} {% if post.status == "ready_to_publish" %} - Ready to publish + {% trans "Ready to publish" %} {% endif %} {% if post.status == "published" %} - Published + {% trans "Published" %} {% endif %} {% if post.status == "unpublishable" %} - Can't be published + {% trans "Can't be published" %} {% endif %} {{ post.date_written|naturalday }} {% if post.status == "published" %} - View on site » + {% trans "View on site" %} » {% endif %}
No posts yet.{% trans "No posts yet." %}
diff --git a/scanblog/templates/blogs/org_post_list.html b/scanblog/templates/blogs/org_post_list.html index d00c902..2ce5929 100644 --- a/scanblog/templates/blogs/org_post_list.html +++ b/scanblog/templates/blogs/org_post_list.html @@ -1,6 +1,6 @@ {% extends "blogs/base_post_list.html" %} -{% block title %}Recent posts from authors in {{ org.name }}{% endblock %} +{% block title %}{% trans "Recent posts from authors in" %} {{ org.name }}{% endblock %} {% block heading %} -

Recent posts from authors in {{ org.name }}

+

{% trans "Recent posts from authors in" %} {{ org.name }}

{{ org.footer|safe }} {% endblock %} diff --git a/scanblog/templates/blogs/page_picker.html b/scanblog/templates/blogs/page_picker.html index ad8dfbe..b8bec40 100644 --- a/scanblog/templates/blogs/page_picker.html +++ b/scanblog/templates/blogs/page_picker.html @@ -1,53 +1,57 @@ {% extends "blogs/base.html" %} -{% block title %}By the page{% endblock %} +{% block title %}{% trans "By the page" %}{% endblock %} {% block body %} -

Every page

+

{% trans "Every page" %}

-
Loading...
+
+ {% trans "Loading..." %} +
{% endblock %} @@ -58,90 +62,90 @@

Every page

var pageData = []; function loadImages() { - $(".pagepicker-loading").show(); - (function(manifestIndex) { - var dataset = manifest[manifestIndex]; - for (var i = 0; i < dataset.num_images; i++) { - (function(i) { - var buildPage = function() { - return $("
").attr( - 'class', 'pagepick' - ).css({ - backgroundPosition: (-i * dataset.image_size[0]) + "px 0px", - backgroundImage: "url(" + dataset.image + ")", - width: dataset.image_size[0] + "px", - height: dataset.image_size[1] + "px" - }).attr({ - "data-dataset": manifestIndex, - "data-index": i - }); - } - var overTimeout = null; - var showOverlay = function(event) { - var data = pageData[manifestIndex].data[i]; - var overlay = $("
").attr( - "class", "page-overlay" - ).append([ - "
", - "", - "", - "", - "", - "", data.title, "", - "
", - "(", data.page_count, " page", - data.page_count == 1 ? "" : "s", ")", - "
", - "", - "", data.author, "", - "
", - data.date, - "
" - ].join("")).hover(function() {}, function() { - $(this).remove(); - }); - var pos = $(event.currentTarget).offset(); - $("body").append(overlay.fadeIn()); - //overlay.addClass("fullwidth") // start css transition - $(overlay).css({ - left: Math.min(pos.left - 12, - $("#pagepicker").offset().left + $("#pagepicker").width() - overlay.width() - 22) + "px", - top: (pos.top - 12)+ "px" - }); - $(overlay).addClass("fullwidth"); - }; - $("#pagepicker").append( - buildPage().click(showOverlay).mouseover(function(event) { - overTimeout = window.setTimeout(function() { - showOverlay(event); - }, 500); - }).mouseout(function() { - clearTimeout(overTimeout); - }) - ); + $(".pagepicker-loading").show(); + (function(manifestIndex) { + var dataset = manifest[manifestIndex]; + for (var i = 0; i < dataset.num_images; i++) { + (function(i) { + var buildPage = function() { + return $("
").attr( + 'class', 'pagepick' + ).css({ + backgroundPosition: (-i * dataset.image_size[0]) + "px 0px", + backgroundImage: "url(" + dataset.image + ")", + width: dataset.image_size[0] + "px", + height: dataset.image_size[1] + "px" + }).attr({ + "data-dataset": manifestIndex, + "data-index": i + }); + } + var overTimeout = null; + var showOverlay = function(event) { + var data = pageData[manifestIndex].data[i]; + var overlay = $("
").attr( + "class", "page-overlay" + ).append([ + "
", + "", + "", + "", + "", + "", data.title, "", + "
", + "(", data.page_count, " page", + data.page_count == 1 ? "" : "s", ")", + "
", + "", + "", data.author, "", + "
", + data.date, + "
" + ].join("")).hover(function() {}, function() { + $(this).remove(); + }); + var pos = $(event.currentTarget).offset(); + $("body").append(overlay.fadeIn()); + //overlay.addClass("fullwidth") // start css transition + $(overlay).css({ + left: Math.min(pos.left - 12, + $("#pagepicker").offset().left + $("#pagepicker").width() - overlay.width() - 22) + "px", + top: (pos.top - 12)+ "px" + }); + $(overlay).addClass("fullwidth"); + }; + $("#pagepicker").append( + buildPage().click(showOverlay).mouseover(function(event) { + overTimeout = window.setTimeout(function() { + showOverlay(event); + }, 500); + }).mouseout(function() { + clearTimeout(overTimeout); + }) + ); - })(i); - } - $.get(dataset.datafile, function(data) { - pageData[manifestIndex] = data; - }); - return manifestIndex; - })(manifestIndex); - manifestIndex++; + })(i); + } + $.get(dataset.datafile, function(data) { + pageData[manifestIndex] = data; + }); + return manifestIndex; + })(manifestIndex); + manifestIndex++; } $.get("{{ PUBLIC_MEDIA_URL }}pagepicker/manifest.json", function(data) { - manifest = data.images; - loadImages(); + manifest = data.images; + loadImages(); }); $(window).scroll(function() { - if (manifest && manifestIndex < manifest.length && - $(window).scrollTop() >= $(document).height() - $(window).height() - $(".pagepicker-loading").offset().top) { - loadImages(); - } else if (manifest && manifestIndex >= manifest.length) { - $(".helpusgrow").show(); - $(".pagepicker-loading").hide(); - } + if (manifest && manifestIndex < manifest.length && + $(window).scrollTop() >= $(document).height() - $(window).height() - $(".pagepicker-loading").offset().top) { + loadImages(); + } else if (manifest && manifestIndex >= manifest.length) { + $(".helpusgrow").show(); + $(".pagepicker-loading").hide(); + } }); diff --git a/scanblog/templates/blogs/post_detail.html b/scanblog/templates/blogs/post_detail.html index 70a4332..8e3da13 100644 --- a/scanblog/templates/blogs/post_detail.html +++ b/scanblog/templates/blogs/post_detail.html @@ -4,6 +4,7 @@ {% load thumbnail %} {% load public_url %} + {% block title %}{% firstof post.title "Untitled" %} — {{post.author.profile}}{% endblock %} {% block head %} @@ -20,69 +21,75 @@ {% else %} {% with tx=post.transcription tx_rev=tx.current %} - {% include "blogs/_post_title_line.html" %} + {% include "blogs/_post_title_line.html" %} -
- {% if post.author.profile.blog_name %} - From {{ post.author.profile.blog_name }} - {% endif %} - by {{ post.author.profile.display_name }} - {% if post.author.profile.has_public_profile %} - (author's profile) - {% endif %} - {% if org.public %}, writing for {{ org.name }}{% endif %} - {% if org.public %}{{ org.footer|safe }}{% endif %} -
+
+ {% if post.author.profile.blog_name %} + {% trans "From" %} {{ post.author.profile.blog_name }} + {% endif %} + {% trans "by" %} {{ post.author.profile.display_name }} + {% if post.author.profile.has_public_profile %} + ({% trans "author's profile" %}) + {% endif %} + {% if org.public %}, {% trans "writing for" %} {{ org.name }}{% endif %} + {% if org.public %}{{ org.footer|safe }}{% endif %} +
- {% if post.in_reply_to %} -
- {% with in_reply_to=post.in_reply_to.document %} - {% thumbnail in_reply_to.documentpage_set.all.0.image.path "100" as im %} - - - -
This post is in reply to comments on:  - {{ in_reply_to.get_title }} thumbnail
- {{ in_reply_to.get_title }}
({{ in_reply_to.date_written|naturalday }}) -
- {% endthumbnail %} - {% endwith %} -
- {% endif %} + {% if post.in_reply_to %} +
+ {% with in_reply_to=post.in_reply_to.document %} + {% thumbnail in_reply_to.documentpage_set.all.0.image.path "100" as im %} + + + +
{% trans "This post is in reply to comments on" %}:  + + {{ in_reply_to.get_title }} thumbnail + +
+ + {{ in_reply_to.get_title }} + +
({{ in_reply_to.date_written|naturalday }}) +
+ {% endthumbnail %} + {% endwith %} +
+ {% endif %} - {% include "blogs/_sharing_buttons.html" %} + {% include "blogs/_sharing_buttons.html" %} -
- {% if post.body %} -
{{post.body|linebreaks}}
- {% else %} - {% if post.scan_id %} -
- {% include "blogs/_post_pages.html" %} -
+
+ {% if post.body %} +
{{post.body|linebreaks}}
+ {% else %} + {% if post.scan_id %} +
+ {% include "blogs/_post_pages.html" %} +
-
- - {% if tx %} -

{% trans "Transcription" %} - {% if transcription_open and not post.transcription.locked and perms.scanning.change_transcription %} - - — - {% trans "edit" %}, - {% trans "revisions" %} - - {% endif %} -

-
-

{{ tx.current.body|linebreaks }}

-
- {% endif %} -
- {% endif %} - {% endif %} -
-
+
+ + {% if tx %} +

{% trans "Transcription" %} + {% if transcription_open and not post.transcription.locked and perms.scanning.change_transcription %} + + — + {% trans "edit" %}, + {% trans "revisions" %} + + {% endif %} +

+
+

{{ tx.current.body|linebreaks }}

+
+ {% endif %} +
+ {% endif %} + {% endif %} +
+
{% endwith %} {% endif %}
@@ -95,7 +102,7 @@

{% trans "Transcription" %}

{% trans "Replies" %} {% if comments %}({{comments|length}}){% endif %} {% trans "Replies feed" %}

{% for comment in comments %} - {% include "comments/_comment.html" %} + {% include "comments/_comment.html" %} {% endfor %}
{% if comments_open %} diff --git a/scanblog/templates/blogs/tag_post_list.html b/scanblog/templates/blogs/tag_post_list.html index 6ca1db7..b3e841d 100644 --- a/scanblog/templates/blogs/tag_post_list.html +++ b/scanblog/templates/blogs/tag_post_list.html @@ -1,15 +1,15 @@ {% extends "blogs/base_post_list.html" %} {% block title %} {% if tag %} - Posts tagged “{{ tag|title }}” + {% trans "Posts tagged" %} “{{ tag|title }}” {% else %} - Uncategorized posts + {% trans "Uncategorized posts" %} {% endif %} {% endblock %} {% block heading %} {% if tag %} -

Posts tagged “{{ tag|title }}”

+

{% trans "Posts tagged" %} “{{ tag|title }}”

{% else %} -

Uncategorized posts

+

{% trans "Uncategorized posts" %}

{% endif %} {% endblock %} diff --git a/scanblog/templates/home.html b/scanblog/templates/home.html index f280c9b..cb94cc9 100644 --- a/scanblog/templates/home.html +++ b/scanblog/templates/home.html @@ -1,35 +1,36 @@ {% extends "site_base.html" %} {% load thumbnail %} {% load public_url %} +{% load i18n %} -{% block title %}Human Stories from Prison{% endblock %} +{% block title %}{% trans "Human Stories from Prison" %}{% endblock %} {% block nav_logo_icon %}{% endblock %} -{% block nav_home_text %}Home{% endblock %} +{% block nav_home_text %}{% trans "Home" %}{% endblock %} {% block body %}
{{ site.name }}

{{ site.name }}

-

Human stories from prison

+

{% trans "Human stories from prison" %}

- {{ site.name }} is a weblog platform for people in prison, through + {{ site.name }} {% trans "is a weblog platform for people in prison, through which the 1% of Americans who are in prison can tell their stories. - Leave a comment – we'll pass it on. + Leave a comment – we'll pass it on." %}
-
Gives voice to the voiceless.
+
{% trans "Gives voice to the voiceless." %}
Change.org
-
... encourages inmates to retain their individual identities ...
+
{% trans "... encourages inmates to retain their individual identities ..." %}
technewsdaily.com
-
Amazing stuff.
+
{% trans "Amazing stuff." %}
Christopher Uggen, criminologist
@@ -59,12 +60,12 @@

Featured posts

-

Recent comments

+

{% trans "Recent comments" %}

{% for comment in comments %}
-
{{ comment.created|timesince }} ago
+
{{ comment.created|timesince }} {% trans "ago" %}
“{{ comment.comment|truncatewords:"20" }}”
- By {{ comment.user.profile }} on {{ comment.document.get_title }} + {% trans "By" %} {{ comment.user.profile }} {% trans "on" %} {{ comment.document.get_title }}
{% endfor %} @@ -72,8 +73,8 @@

Recent comments

-

Join the conversation!

-

Head on over to the blogs.

+

{% trans "Join the conversation!" %}

+

{% trans "Head on over to the blogs." %}

{% endblock %} {% block scripts %} From 941c492460ce21f536eea08760b1676b930583d1 Mon Sep 17 00:00:00 2001 From: Arthur Lutz Date: Wed, 30 May 2012 23:21:47 +0200 Subject: [PATCH 02/53] i18n round up in templates (mainly in registration/) --- scanblog/templates/about/about_base.html | 4 ++-- scanblog/templates/registration/activate.html | 4 ++-- .../registration/activation_complete.html | 5 +++-- .../templates/registration/activation_email.txt | 16 ++++++++-------- .../registration/activation_email_subject.txt | 3 ++- scanblog/templates/registration/login.html | 16 ++++++++-------- .../registration/password_change_form.html | 4 ++-- .../registration/password_reset_form.html | 6 +++--- .../registration/registration_closed.html | 4 ++-- .../registration/registration_complete.html | 6 +++--- .../registration/registration_form.html | 8 ++++---- scanblog/templates/registration/welcome.html | 12 ++++++------ 12 files changed, 45 insertions(+), 43 deletions(-) diff --git a/scanblog/templates/about/about_base.html b/scanblog/templates/about/about_base.html index 685b1dd..472ab46 100644 --- a/scanblog/templates/about/about_base.html +++ b/scanblog/templates/about/about_base.html @@ -9,6 +9,6 @@ {% block subnav %} {% trans "Community Guidelines" %} {% trans "Frequently Asked Questions" %} - News - Mailing list + {% trans "News %} + {% trans "Mailing list" %} {% endblock %} diff --git a/scanblog/templates/registration/activate.html b/scanblog/templates/registration/activate.html index da96403..ce226e4 100644 --- a/scanblog/templates/registration/activate.html +++ b/scanblog/templates/registration/activate.html @@ -2,6 +2,6 @@ {% load i18n %} {% block body %} -

Oops!

-

That isn't a valid confirmation key. Please check the link again. If your email reader adds line breaks in the URL, you may need to remove them. You may also request a new comfirmation email.

+

%{ trans "Oops!" %}

+

%{ trans "That isn't a valid confirmation key. Please check the link again. If your email reader adds line breaks in the URL, you may need to remove them. You may also" %} %{ trans "request a new comfirmation email" %}.

{% endblock %} diff --git a/scanblog/templates/registration/activation_complete.html b/scanblog/templates/registration/activation_complete.html index a6739fc..9d582f5 100644 --- a/scanblog/templates/registration/activation_complete.html +++ b/scanblog/templates/registration/activation_complete.html @@ -2,9 +2,10 @@ {% load i18n %} {% block body %} -

Welcome!

+

%{ trans "Welcome!" %}

-Your registration is now complete. You may now login. +{% trans "Your registration is now complete." %} + {% trans "You may now" %} {% trans "login" %}.

{% endblock %} diff --git a/scanblog/templates/registration/activation_email.txt b/scanblog/templates/registration/activation_email.txt index c44e383..bf7fe36 100644 --- a/scanblog/templates/registration/activation_email.txt +++ b/scanblog/templates/registration/activation_email.txt @@ -1,16 +1,16 @@ -Hello, +%{ trans "Hello" %}, -Welcome to {{ site.name }}! You've just joined a community of respectful -people who value helping to give a voice to the voiceless. +%{ trans "Welcome to {{ site.name }}! You've just joined a community of respectful +people who value helping to give a voice to the voiceless." %} -To complete your registration, follow this link: +%{ trans "To complete your registration, follow this link:" %} {{ base_url }}/accounts/activate/{{ activation_key }}/ -This link will expire in {{ expiration_days }} days, so don't delay. +%{ trans "This link will expire in {{ expiration_days }} days, so don't delay." %} -See you on {{ site.name }}! +%{ trans "See you on {{ site.name }}! "%} -Sincerely, +%{ trans "Sincerely" %}, -{{ site.name }} staff +%{ trans "{{ site.name }} staff" %} {{ base_url }} diff --git a/scanblog/templates/registration/activation_email_subject.txt b/scanblog/templates/registration/activation_email_subject.txt index 02b2867..d008795 100644 --- a/scanblog/templates/registration/activation_email_subject.txt +++ b/scanblog/templates/registration/activation_email_subject.txt @@ -1 +1,2 @@ -{{ site.name }} Registration Confirmation +{% load i18n %} +{{ site.name }} %{ trans "Registration Confirmation" %} diff --git a/scanblog/templates/registration/login.html b/scanblog/templates/registration/login.html index 4901fde..105d318 100644 --- a/scanblog/templates/registration/login.html +++ b/scanblog/templates/registration/login.html @@ -4,7 +4,7 @@ {% block body %}
{% if document %} -

Current profile page:

-

Remove scan

+

{% trans "Current profile page" %}:

+

{% trans "Remove scan" %}

{% for page in document.documentpage_set.all %} - Profile for {{ profile.display_name }}
+ {% trans "Profile for" %} {{ profile.display_name }}
{% endfor %} {% endif %} {% if document.transcription %} -

Transcription

-

edit

+

{% trans "Transcription" %}

+

{% trans "edit" %}

{{ document.transcription.current.body|linebreaksbr }} {% endif %}
-Delete account +{% trans "Delete account" %} {% endblock %} diff --git a/scanblog/templates/profiles/profiles_list.html b/scanblog/templates/profiles/profiles_list.html index 2e52d5c..477d2a6 100644 --- a/scanblog/templates/profiles/profiles_list.html +++ b/scanblog/templates/profiles/profiles_list.html @@ -10,21 +10,21 @@

{% trans "All authors" %}

    {% for profile in authors %} -
  • - {% if profile.authored_posts_count > 0 %} - {{ profile.display_name }} - ({{ profile.authored_posts_count }} - post{{ profile.authored_posts_count|pluralize }}, - latest {{ profile.latest_post|naturalday }}) - {% else %} - {{ profile.display_name }} — - {% endif %} - {% if profile.has_public_profile %} - profile - {% endif %} -
    • +
  • + {% if profile.authored_posts_count > 0 %} + {{ profile.display_name }} + ({{ profile.authored_posts_count }} + post{{ profile.authored_posts_count|pluralize }}, + latest {{ profile.latest_post|naturalday }}) + {% else %} + {{ profile.display_name }} — + {% endif %} + {% if profile.has_public_profile %} + profile + {% endif %} +
    • {% endfor %}

From bab07d7337451a1a2efa5eb311267f9d789ba901 Mon Sep 17 00:00:00 2001 From: Arthur Lutz Date: Tue, 26 Jun 2012 08:15:49 +0200 Subject: [PATCH 14/53] i18n round on templates/subscriptions --- .../templates/subscriptions/subscribe_to.html | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/scanblog/templates/subscriptions/subscribe_to.html b/scanblog/templates/subscriptions/subscribe_to.html index ab2ad1c..e015d32 100644 --- a/scanblog/templates/subscriptions/subscribe_to.html +++ b/scanblog/templates/subscriptions/subscribe_to.html @@ -1,21 +1,23 @@ {% extends "profiles/base.html" %} -{% block title %}Add subscription{% endblock %} +{% block title %}{% trans "Add subscription" %}{% endblock %} {% block body %} -

Add subscription

-

Add a subscription to -{% if tag %}posts tagged “{{ tag }}”?{% endif %} -{% if author %}posts by {{ author.profile }}?{% endif %} -{% if document %}comments on “{{ document.get_title }}” by {{ document.author.profile }}?{% endif %} -{% if org %}posts from {{ org.name }} authors{% endif %} -

{% csrf_token %}
-Subscription settings +

{% trans "Add subscription" %}

+

{% trans "Add a subscription to" %} +{% if tag %}{% trans "posts tagged" %} “{{ tag }}”?{% endif %} +{% if author %}{% trans "posts by" %} {{ author.profile }}?{% endif %} +{% if document %}{% trans "comments on" %} “{{ document.get_title }}” {% trans "by" %} {{ document.author.profile }}?{% endif %} +{% if org %}{% trans "posts from" %} {{ org.name }} {% trans "authors" %}{% endif %} +

{% csrf_token %}
+{% trans "Subscription settings" %}

{% if not user.email %}

+{% blocktrans %} Note: you have no email address set in your profile, so you will only see notifications by logging into the site. If you'd like to receive email notifications, please add an email address in your profile. +{% endblocktrans %}

{% endif %} {% endblock %} From 11042ad993abf41fbe44c82f8a02c29ccc91e082 Mon Sep 17 00:00:00 2001 From: Arthur Lutz Date: Tue, 26 Jun 2012 09:07:08 +0200 Subject: [PATCH 15/53] i18n round on templates/about --- scanblog/templates/about/faq.html | 78 ++++++++------- scanblog/templates/about/get_involved.html | 4 +- scanblog/templates/about/index.html | 106 +++++++++++++-------- scanblog/templates/about/privacy.html | 26 +++-- scanblog/templates/about/terms.html | 10 +- 5 files changed, 136 insertions(+), 88 deletions(-) diff --git a/scanblog/templates/about/faq.html b/scanblog/templates/about/faq.html index 8bd4116..98da903 100644 --- a/scanblog/templates/about/faq.html +++ b/scanblog/templates/about/faq.html @@ -4,47 +4,51 @@ {% block title %}{% trans "Frequently Asked Questions" %}{% endblock %} {% block body %} -

Frequently Asked Questions

-

Please also see the -community guidelines -for commenting and transcribing posts. +

{% trans "Frequently Asked Questions" %}

+

{% blocktrans %} + Please also see the + community guidelines + for commenting and transcribing posts. + {% endblocktrans %}

-
Who is behind this?
+
{%trans "Who is behind this?" %}

+ {% blocktrans %} Between the Bars was founded by Charlie DeTar and Benjamin Mako Hill. It is operated by Charlie DeTar and volunteers and staff in the Center for Civic Media at MIT. + {% endblocktrans %}

-
Why blogging?
+
{% trans "Why blogging?" %}

-

"It's his lifeline really. He gets printouts back. The - other inmates get copies as well and they're quite pleased. - It's a link, not just for him to the outside world, but for his - inmate friends as well; a lifeline to the outside world."
- - – Derick Attwood, father of imprisoned Shaun Attwood, speaking - about his son's blog, - Jon's Jail Journal.

- -
-

- I think what it really has to do is being listened to.... These - people are saying 'please don't presume to speak for me'. - We have a fascinating backdoor open with blogs... it really is - diverse and complicated.
- - – Ethan Zuckerman, speaking about "bridge blogs" that - service communities without access to other forms broadcast - media. - (source) - -

-

- Blogging can not only let people in prison tell their stories and - report on their conditions, but it can also provide an instrumental - role in maintaining "weak-tie" social networks (acquaintances and - friends of friends), which are important for helping people - to find jobs and communities in which to live. This can reduce recidivism. -

+

"It's his lifeline really. He gets printouts back. The + other inmates get copies as well and they're quite pleased. + It's a link, not just for him to the outside world, but for his + inmate friends as well; a lifeline to the outside world."
+ + – Derick Attwood, father of imprisoned Shaun Attwood, speaking + about his son's blog, + Jon's Jail Journal.

+ +
+

+ I think what it really has to do is being listened to.... These + people are saying 'please don't presume to speak for me'. + We have a fascinating backdoor open with blogs... it really is + diverse and complicated.
+ + – Ethan Zuckerman, speaking about "bridge blogs" that + service communities without access to other forms broadcast + media. + (source) + +

+

+ Blogging can not only let people in prison tell their stories and + report on their conditions, but it can also provide an instrumental + role in maintaining "weak-tie" social networks (acquaintances and + friends of friends), which are important for helping people + to find jobs and communities in which to live. This can reduce recidivism. +

How often do prisoners receive comments that I leave?

@@ -71,7 +75,7 @@

Frequently Asked Questions

people have been - doing + doing for a long time. However, it has previously only been accessible to people who have tech-savvy friends or family with enough time on their hands to transcribe letters. Prison blogging has been @@ -81,7 +85,7 @@

Frequently Asked Questions

(and found legal), and is fundamentally no more risky than prison penpal - services + services which abound.

diff --git a/scanblog/templates/about/get_involved.html b/scanblog/templates/about/get_involved.html index 4e38108..da7d748 100644 --- a/scanblog/templates/about/get_involved.html +++ b/scanblog/templates/about/get_involved.html @@ -1,6 +1,6 @@ {% extends "site_base.html" %} -{% block title %}Get involved{% endblock %} +{% block title %}{% trans "Get involved" %}{% endblock %} {% block body %} -comment ... volunteer ... process mail ... +{% trans "comment ... volunteer ... process mail ..." %} {% endblock %} {% block nav_get_involved_active %}active{% endblock %} diff --git a/scanblog/templates/about/index.html b/scanblog/templates/about/index.html index 663ae55..a5f09f9 100644 --- a/scanblog/templates/about/index.html +++ b/scanblog/templates/about/index.html @@ -5,29 +5,46 @@ {% block body %} -

About {{ site.name }}

-

{{ site.name }} is a weblog platform for people in +

+ {% blocktrans %} + About {{ site.name }} + {% endblocktrans %} +

+

+ {% blocktrans %} + {{ site.name }} is a weblog platform for people in prison, through which the 1% of America which is behind bars can tell their stories. Since people in prison are routinely denied access to the Internet, we enable them to blog by scanning letters. We aim to provide a @@ -36,34 +53,45 @@

About {{ site.name }}

inside and outside of prison, and a means to promote non-criminal identities and personal expression. We hope to improve prisoner's lives, and help to reduce recidivism. + {% endblocktrans %}

- -

Leave comments

+ +

{% trans "Leave comments" %}

- Registered users can comment on blog posts. We periodically mail - comment feeds back to the authors so they can hear from their fans and - continue the discussion. - Sign up and - log in today! + {% blocktrans %} + Registered users can comment on blog posts. We periodically mail + comment feeds back to the authors so they can hear from their fans and + continue the discussion. + Sign up and + log in today! + {% endblocktrans %}

-

Transcribe posts

+

{% trans "Transcribe posts" %}

- {{ site.name }} relies on visitors to transcribe its bloggers' posts. - You can help us out by - signing up and - logging in, - and starting to transcribe posts that interest you. Transcriptions - make the blogs more accessible to search engines, translators and - visitors. + {% blocktrans %} + {{ site.name }} relies on visitors to transcribe its bloggers' posts. + You can help us out by + signing up and + logging in, + and starting to transcribe posts that interest you. Transcriptions + make the blogs more accessible to search engines, translators and + visitors. + {% blocktrans %}




- Center for Civic Media + {% blocktrans %} + Center for Civic Media + {% endblocktrans %}
-


{{ site.name }} is supported by generous sponsorship from the - Center for Civic Media at MIT.

+


+ {% blocktrans %} + {{ site.name }} is supported by generous sponsorship from the + Center for Civic Media at MIT. + {% endblocktrans %} +


- + {% endblock %} diff --git a/scanblog/templates/about/privacy.html b/scanblog/templates/about/privacy.html index 8172bb0..d6ca82c 100644 --- a/scanblog/templates/about/privacy.html +++ b/scanblog/templates/about/privacy.html @@ -4,17 +4,26 @@
-

Between the Bars Privacy Policy

+

+ {% blocktrans %} + Between the Bars Privacy Policy + {% endblocktrans %} +

-

PLEASE REVIEW BEFORE USING THIS WEBSITE – IF YOU DO NOT AGREE WITH ALL OF - THE TERMS OF THE BTB PRIVACY POLICY, DO NOT USE THIS WEBSITE.

+

+ {% blocktrans %} + PLEASE REVIEW BEFORE USING THIS WEBSITE – IF YOU DO NOT AGREE WITH ALL OF + THE TERMS OF THE BTB PRIVACY POLICY, DO NOT USE THIS WEBSITE. + {% blocktrans %} +

+ {% blocktrans %}

-The following discloses the information gathering and dissemination practices -for the Between the Bars (“BtB”) website available at -http://betweenthebars.org -(the “Site”). Your use of the Site constitutes your agreement to this privacy -policy and consent to the terms herein. +The following discloses the information gathering and dissemination +practices for the Between the Bars (“BtB”) website available at +http://betweenthebars.org (the “Site”). +Your use of the Site constitutes your agreement to this privacy policy +and consent to the terms herein.

@@ -103,6 +112,7 @@

Contacting BtB

Effective Date of the Agreement is 2010-11-15.

+{% endblocktrans %}
{% endblock %} diff --git a/scanblog/templates/about/terms.html b/scanblog/templates/about/terms.html index 5a4b1b8..8e7931d 100644 --- a/scanblog/templates/about/terms.html +++ b/scanblog/templates/about/terms.html @@ -4,8 +4,13 @@ {% block title %}{% trans "Terms of Use" %}{% endblock %} {% block body %}
-

Between the Bars Terms of Use

-

PLEASE REVIEW BEFORE USING THIS WEBSITE – IF YOU DO NOT AGREE TO THESE TERMS OF USE, DO NOT USE THIS WEBSITE.

+

{% trans "Between the Bars Terms of Use" %}

+

+{% blocktrans %} + PLEASE REVIEW BEFORE USING THIS WEBSITE – IF YOU DO NOT AGREE TO THESE TERMS OF USE, DO NOT USE THIS WEBSITE. +{% endblocktrans %} +

+{% blocktrans %}

General

Welcome to Between the Bars (“BtB”). BtB is a blog platform for prisoners @@ -297,6 +302,7 @@

Governing Law and Entire Agreement

Effective Date of the Agreement is 2010-11-15.

+{% endblocktrans %}
{% endblock %} From 969fd51a8329406577126e570a712674b9595525 Mon Sep 17 00:00:00 2001 From: Arthur Lutz Date: Wed, 11 Jul 2012 20:18:05 +0200 Subject: [PATCH 16/53] i18n pass on templates/feeds --- scanblog/templates/feeds/_all.html | 2 +- scanblog/templates/feeds/_author.html | 2 +- scanblog/templates/feeds/_comments.html | 2 +- scanblog/templates/feeds/_featured.html | 2 +- scanblog/templates/feeds/_org.html | 2 +- scanblog/templates/feeds/_subscriptions.html | 146 ++++++++++--------- scanblog/templates/feeds/_tag.html | 2 +- 7 files changed, 82 insertions(+), 76 deletions(-) diff --git a/scanblog/templates/feeds/_all.html b/scanblog/templates/feeds/_all.html index cbab3cd..5923e42 100644 --- a/scanblog/templates/feeds/_all.html +++ b/scanblog/templates/feeds/_all.html @@ -1 +1 @@ - + diff --git a/scanblog/templates/feeds/_author.html b/scanblog/templates/feeds/_author.html index 6b18f51..0597ff0 100644 --- a/scanblog/templates/feeds/_author.html +++ b/scanblog/templates/feeds/_author.html @@ -1 +1 @@ - + diff --git a/scanblog/templates/feeds/_comments.html b/scanblog/templates/feeds/_comments.html index 6b4be4b..68ab6aa 100644 --- a/scanblog/templates/feeds/_comments.html +++ b/scanblog/templates/feeds/_comments.html @@ -1 +1 @@ - + diff --git a/scanblog/templates/feeds/_featured.html b/scanblog/templates/feeds/_featured.html index 14f0595..62704f9 100644 --- a/scanblog/templates/feeds/_featured.html +++ b/scanblog/templates/feeds/_featured.html @@ -1 +1 @@ - + diff --git a/scanblog/templates/feeds/_org.html b/scanblog/templates/feeds/_org.html index 482da17..c5ad1d9 100644 --- a/scanblog/templates/feeds/_org.html +++ b/scanblog/templates/feeds/_org.html @@ -1 +1 @@ - + diff --git a/scanblog/templates/feeds/_subscriptions.html b/scanblog/templates/feeds/_subscriptions.html index 8efea20..5c80d50 100644 --- a/scanblog/templates/feeds/_subscriptions.html +++ b/scanblog/templates/feeds/_subscriptions.html @@ -3,84 +3,90 @@

{% trans "Subscribe" %}

{% trans "Get notifications when new letters or replies are posted!" %} - {% trans "Posts by" as posts_by %} + {% trans "Posts by" as posts_by %} {% trans "Posts from" as posts_from %} {% trans "Comments on" as comments_on %} {% trans "Posts tagged with" as posts_tagged %} - {% if feed_author %} - - - - - - {% endif %} - {% if org and org.public %} - - - - - - {% endif %} - {% if comment_feed_obj %} - - - - + + + + + {% endif %} + {% if org and org.public %} + + + + + + {% endif %} + {% if comment_feed_obj %} + + + + - - {% endif %} - {% if tag %} - - - - - - {% endif %} - - - - - - - + {% endif %} + {% if tag %} + + + + + + {% endif %} + + + + + + + - - + + +
- {{ posts_by }} {{ feed_author.profile }}: - - RSS - - email me -
- {{ posts_from }} {{ org.name }}: - - RSS - - email me -
- {{ comments_on }} “{{ comment_feed_obj }}”: - - RSS - + {% if feed_author %} +
+ {{ posts_by }} {{ feed_author.profile }}: + + RSS + + {%trans "email me" %} +
+ {{ posts_from }} {{ org.name }}: + + RSS + + {% trans "email me" %} +
+ {{ comments_on }} “{{ comment_feed_obj }}”: + + RSS + - email me -
- {{ posts_tagged }} “{{ tag }}”: - - RSS - - email me -
{% trans "Featured posts" %}: - RSS - - + {% trans "email me" %} -
- {% blocktrans with site_name=site.name %} + +
+ {{ posts_tagged }} “{{ tag }}”: + + RSS + + {% trans "email me" %} +
{% trans "Featured posts" %}: + + RSS + + + + {% trans "email me" %} + +
+ {% blocktrans with site_name=site.name %} All {{ site_name }} posts: {% endblocktrans %} - - RSS -
+ + RSS + +

diff --git a/scanblog/templates/feeds/_tag.html b/scanblog/templates/feeds/_tag.html index 0601749..3be5169 100644 --- a/scanblog/templates/feeds/_tag.html +++ b/scanblog/templates/feeds/_tag.html @@ -1 +1 @@ - + From 2edd564ff2f242861ea2420b4fd2a08c3f44ec14 Mon Sep 17 00:00:00 2001 From: Arthur Lutz Date: Wed, 11 Jul 2012 20:48:47 +0200 Subject: [PATCH 17/53] i18n round on templates/correspondence --- scanblog/templates/correspondence/#base.html# | 19 ++ .../#created-packet-template.tex# | 68 +++++ scanblog/templates/correspondence/.#base.html | 1 + .../.#created-packet-template.tex | 1 + scanblog/templates/correspondence/base.html | 12 +- .../correspondence/base_letter_list.html | 256 ++++++++++-------- .../correspondence/comment-mailing.tex | 4 +- .../correspondence/delete_letter_confirm.html | 13 +- .../correspondence/first-post-template.tex | 5 +- .../correspondence/generic-letter.tex | 2 +- .../correspondence/intro-packet-cover.tex | 2 + .../mass_mailing_spreadsheet.html | 59 +++- .../templates/correspondence/pending.html | 102 ++++--- .../correspondence/show_commentmailing.html | 28 +- .../correspondence/waitlist-postcard.txt | 2 + 15 files changed, 397 insertions(+), 177 deletions(-) create mode 100644 scanblog/templates/correspondence/#base.html# create mode 100644 scanblog/templates/correspondence/#created-packet-template.tex# create mode 120000 scanblog/templates/correspondence/.#base.html create mode 120000 scanblog/templates/correspondence/.#created-packet-template.tex diff --git a/scanblog/templates/correspondence/#base.html# b/scanblog/templates/correspondence/#base.html# new file mode 100644 index 0000000..882659e --- /dev/null +++ b/scanblog/templates/correspondence/#base.html# @@ -0,0 +1,19 @@ +{% extends "site_base.html" %} + +{% block tab_correspondence_class %}{{ui_tab_active}}{% endblock %} + +{% block subnav %} + +{% endblock %} diff --git a/scanblog/templates/correspondence/#created-packet-template.tex# b/scanblog/templates/correspondence/#created-packet-template.tex# new file mode 100644 index 0000000..fa6c969 --- /dev/null +++ b/scanblog/templates/correspondence/#created-packet-template.tex# @@ -0,0 +1,68 @@ +{% extends "correspondence/generic-letter.tex" %} +{% load tex_tags %} +{% load i18n %} +{% block opening %}{% trans "Greetings and welcome," %}{% endblock %} +{% block body %} +{% blocktrans %} +We have received your signed consent form and have created a blog for you on +our web site. You can tell anybody with access to the Internet how to visit +your blog by giving them the following ``URL'' or Internet address: +{% endblocktrans %} + +\begin{quote} +\url{ {{ letter.recipient.profile.get_bare_blog_url|absolute_url|tex_escape }} } +\end{quote} + +{% blocktrans %} +As we explained in our introductory materials, we will publish all +material that you send to us. +{% endblocktrans %} + +{% blocktrans %} +There is no single style or form for blog posts and every blog is +different. That said, blog posts should be things you have written +yourself. Most blog posts tend to be between 1 and 5 pages long but +can be longer or very short. Authors of blogs usually write about +their own thoughts or experiences but some use their blogs to share +artwork, poetry, fiction, public ``diary'' entries. Others share open +letters to world about issues they care about. Keeping in mind the +very public nature of the venue, you should feel free to send us +whatever you wish to share. +{% endblocktrans %} + +{% blocktrans %} +To show you how the post appears on the web, we will send you a +printout of your first post. However, we will \emph{not} send you +written confirmation each time we receive and post material you send +us. If we cannot publish material you send for any reason, or if we +must remove material you have published, we will always contact you to +tell you. Unless we contact you to tell you otherwise, we have +published your material on the Internet. +{% endblocktrans %} + +{% blocktrans %} +Visitors who read your blog will have the opportunity to leave public +``comments.'' These comments will be visible to any other visitor on +the website. Periodically and as frequently as possible -- probably +every 1-2 weeks -- we will mail you any new comments that visitors +leave on material you have published. If no new comments are left, we +will not contact you to tell you. Keep in mind that most viewers will +not leave comments and a lack of comments does not mean a lack of +people reading the posts you have shared. +{% endblocktrans %} + +{% blocktrans %} +We cannot provide you with any means to contact or ``email'' people +leaving comments either privately or directly. Of course, you are +welcome to send us new material that responds to comments you +receive. Commenters may, or may not, return to your blog to view your +responses. +{% endblocktrans %} + +{% blocktrans %} +Please remember that these exchanges, like all information published +using our service, will be completely public and listed under your +full name. +{% endblocktrans %} +{% endblock %} +{% block signature %} {{ letter.org.personal_contact|tex_escape }} {% endblock %} diff --git a/scanblog/templates/correspondence/.#base.html b/scanblog/templates/correspondence/.#base.html new file mode 120000 index 0000000..8cdbaf3 --- /dev/null +++ b/scanblog/templates/correspondence/.#base.html @@ -0,0 +1 @@ +arthur@draco.logilab.fr.7001:1341989713 \ No newline at end of file diff --git a/scanblog/templates/correspondence/.#created-packet-template.tex b/scanblog/templates/correspondence/.#created-packet-template.tex new file mode 120000 index 0000000..8cdbaf3 --- /dev/null +++ b/scanblog/templates/correspondence/.#created-packet-template.tex @@ -0,0 +1 @@ +arthur@draco.logilab.fr.7001:1341989713 \ No newline at end of file diff --git a/scanblog/templates/correspondence/base.html b/scanblog/templates/correspondence/base.html index 56b16df..e1b02c7 100644 --- a/scanblog/templates/correspondence/base.html +++ b/scanblog/templates/correspondence/base.html @@ -5,9 +5,15 @@ {% block subnav %} {% endblock %} diff --git a/scanblog/templates/correspondence/base_letter_list.html b/scanblog/templates/correspondence/base_letter_list.html index 2a7952e..2f1d5b5 100644 --- a/scanblog/templates/correspondence/base_letter_list.html +++ b/scanblog/templates/correspondence/base_letter_list.html @@ -12,10 +12,10 @@ function post_letter_sent(letter_id, checked) { jQuery.post("{% url correspondence.edit_letter_sent %}", { - 'letter_id': letter_id, - 'checked': checked, + 'letter_id': letter_id, + 'checked': checked, }, function() { - message("{% trans 'Changed letter sent status.' %}"); + message("{% trans 'Changed letter sent status.' %}"); }); } @@ -27,124 +27,164 @@ - - - - - + + + + + {% for letter in letters %} {% with u=letter.recipient name=letter.recipient_name %} - - - - - - - + + + + + + + {% endwith %} {% endfor %}
RecipientSentLettersDate createdSender{% trans "Recipient" %}{% trans "Sent" %}{% trans "Letters" %}{% trans "Date created" %}{% trans "Sender" %}
- {% ifchanged name %} - {% if u %} - {% if u.profile.mailing_address %} - - {% else %} - Address missing – Add one? - {% endif %} - {{ letter.recipient.profile }} - {% else %} - - {{ name }} - {% endif %} - {% endifchanged %} - - - - {% if letter.type == "consent_form" %} -
- Consent form: joined {{ letter.recipient.date_joined|date:"Y-m-j" }} -
- {% endif %} - {% if letter.type == "signup_complete" %} -
- - Signup complete -
- {% endif %} - {% if letter.type == "first_post" %} -
- - First post -
- {% endif %} - {% if letter.type == "letter" %} -
- - - Letter -
-
- {{ letter.body|truncatewords:100 }} -
- {% endif %} - {% if letter.type == "comments" %} - - {% with comments=letter.sorted_comments %} - {% for comment in comments %} - {% with post=comment.commentpost.post profile=post.author.profile %} - {% ifchanged post.author %} - - {% endifchanged %} - - - - - - - - - {% endwith %} - {% endfor %} - {% endwith %} -
- - Comments -
{% ifchanged post.title %}{% firstof post.title post.id %}{% endifchanged %} - {% ifchanged comment.user.profile %} - {{ comment.user.profile }} - {% endifchanged %} - {{ comment.comment }}{{ comment.id }}{{ comment.submit_date|naturalday }}{% if perms.comments.can_moderate %} - Remove - {% endif %} -
- {% endif %} - {% if letter.type == "waitlist" %} -
- Waitlist -
-
- {% endif %} - 		- {{ letter.created|naturalday }} - - {{ letter.sender_name }} -
+ {% ifchanged name %} + {% if u %} + {% if u.profile.mailing_address %} + + + + {% else %} + {% trans "Address missing" %} – + + {% trans "Add one?" %} + + {% endif %} + + {{ letter.recipient.profile }} + + {% else %} + + + + {{ name }} + {% endif %} + {% endifchanged %} + + + + {% if letter.type == "consent_form" %} +
+ + {% trans "Consent form: joined" %} + {{ letter.recipient.date_joined|date:"Y-m-j" }} + +
+ {% endif %} + {% if letter.type == "signup_complete" %} +
+ + + {% trans "Signup complete" %} + +
+ {% endif %} + {% if letter.type == "first_post" %} +
+ + + + + {% trans "First post" %} + +
+ {% endif %} + {% if letter.type == "letter" %} +
+ + + + + + {% trans "Letter" %} + +
+
+ {{ letter.body|truncatewords:100 }} +
+ {% endif %} + {% if letter.type == "comments" %} + + {% with comments=letter.sorted_comments %} + {% for comment in comments %} + {% with post=comment.commentpost.post profile=post.author.profile %} + {% ifchanged post.author %} + + {% endifchanged %} + + + + + + + + + {% endwith %} + {% endfor %} + {% endwith %} +
+ + + + + + {% trans "Comments" %} + +
{% ifchanged post.title %} + + {% firstof post.title post.id %} + + {% endifchanged %} + {% ifchanged comment.user.profile %} + {{ comment.user.profile }} + {% endifchanged %} + {{ comment.comment }}{{ comment.id }}{{ comment.submit_date|naturalday }}{% if perms.comments.can_moderate %} + + {% trans "Remove" %} + + {% endif %} +
+ {% endif %} + {% if letter.type == "waitlist" %} +
+ + + + {% trans "Waitlist" %} + +
+
+ {% endif %} + 		+ {{ letter.created|naturalday }} + + {{ letter.sender_name }} +
diff --git a/scanblog/templates/correspondence/comment-mailing.tex b/scanblog/templates/correspondence/comment-mailing.tex index 59c98b6..1bc6232 100644 --- a/scanblog/templates/correspondence/comment-mailing.tex +++ b/scanblog/templates/correspondence/comment-mailing.tex @@ -1,6 +1,7 @@ {% extends "correspondence/generic-letter.tex" %} {% load tex_tags %} {% block body %} +{% blocktrans %} Please find enclosed a printout of recent comments visitors have left on your blog. NEW: You can now reply directly to these comments, and the commenters will get notified that you have replied. Each set of comments has a unique @@ -15,7 +16,7 @@ do we endorse them -- we just forward them on to you. If there are comments that you disagree with, please remember that there are all kinds of people on the Internet, and while most are well intentioned, some may be less so. The -best response to negative comments is usually no response. +best response to negative comments is usually no response. Please remember that all information published using our service will be completely public and listed under your full name; we ask you not to send us @@ -24,6 +25,7 @@ You can share the following Internet address (``URL'') to direct people to your blog: +{% endblocktrans %} \begin{quote} \url{ {{ letter.recipient.profile.get_bare_blog_url|absolute_url|tex_escape }} } diff --git a/scanblog/templates/correspondence/delete_letter_confirm.html b/scanblog/templates/correspondence/delete_letter_confirm.html index a6f7507..76744c4 100644 --- a/scanblog/templates/correspondence/delete_letter_confirm.html +++ b/scanblog/templates/correspondence/delete_letter_confirm.html @@ -1,15 +1,18 @@ {% extends "correspondence/base.html" %} -{% block title %}Confirm delete letter{% endblock %} +{% block title %}{% trans "Confirm delete letter" %}{% endblock %} {% block body %}

-

Are you sure you want to delete this letter?

+

{% trans "Are you sure you want to delete this letter?" %}

{% csrf_token %} - cancel + + + {% trans "cancel" %} +

-

To: {{ letter.recipient_name }}
-From: {{ letter.sender_name }}
+

{% trans "To" %}: {{ letter.recipient_name }}
+{% trans "From" %}: {{ letter.sender_name }}
{{ letter.body|linebreaks }} diff --git a/scanblog/templates/correspondence/first-post-template.tex b/scanblog/templates/correspondence/first-post-template.tex index 1594c66..86a66f0 100644 --- a/scanblog/templates/correspondence/first-post-template.tex +++ b/scanblog/templates/correspondence/first-post-template.tex @@ -1,6 +1,7 @@ {% extends "correspondence/generic-letter.tex" %} {% load tex_tags %} {% block body %} +{% blocktrans %} Thanks for sending your first post or profile. Please find enclosed a printout showing how it looks on the Internet. From this point forward, we won't send additional printouts of each post you send; however, we will periodically send @@ -8,14 +9,16 @@ You can share the following Internet address (``URL'') to direct people to your blog: - +{% endblocktrans %} \begin{quote} \url{ {{ letter.recipient.profile.get_bare_blog_url|absolute_url|tex_escape }} } \end{quote} +{% blocktrans %} Please remember that all information published using our service will be completely public and listed under your full name; we ask you not to send us anything illegal, incriminatory, or which might negatively affect your chances for parole. +{% endblocktrans %} {% endblock %} {% block signature %} {{ letter.org.personal_contact|tex_escape }} {% endblock %} diff --git a/scanblog/templates/correspondence/generic-letter.tex b/scanblog/templates/correspondence/generic-letter.tex index 27b6aea..25dc056 100644 --- a/scanblog/templates/correspondence/generic-letter.tex +++ b/scanblog/templates/correspondence/generic-letter.tex @@ -29,7 +29,7 @@ {{ letter.body|safe }} {% endblock %} -\closing{ {% block closing %}Kind Regards,{% endblock %} } +\closing{ {% block closing %}{% trans "Kind Regards," %}{% endblock %} } \end{letter} diff --git a/scanblog/templates/correspondence/intro-packet-cover.tex b/scanblog/templates/correspondence/intro-packet-cover.tex index 1c02415..5acebd3 100644 --- a/scanblog/templates/correspondence/intro-packet-cover.tex +++ b/scanblog/templates/correspondence/intro-packet-cover.tex @@ -4,6 +4,7 @@ \renewcommand{\labelitemi}{\underline{\hspace{0.6cm}}} % Show bullets as short lines +{% blocktrans %} We'd like to invite you to join \emph{Between the Bars}! If you'd like to blog with us, please complete each item in the following checklist in order to get started (the checklist is for your use; no need to send it to us): @@ -20,6 +21,7 @@ \end{itemize} We hope this answers any questions you might have, but if not, don't hesitate to write us. +{% endblocktrans %} {% endblock %} {% block signature %} {{ letter.org.personal_contact|tex_escape }} {% endblock %} diff --git a/scanblog/templates/correspondence/mass_mailing_spreadsheet.html b/scanblog/templates/correspondence/mass_mailing_spreadsheet.html index 2b3ec88..f75bf03 100644 --- a/scanblog/templates/correspondence/mass_mailing_spreadsheet.html +++ b/scanblog/templates/correspondence/mass_mailing_spreadsheet.html @@ -1,29 +1,64 @@ {% extends "moderation/base.html" %} -{% block title %}Mass mailing spreadsheet{% endblock %} +{% block title %}{% trans "Mass mailing spreadsheet" %}{% endblock %} {% block body %} -

Mass Mailing Spreadsheet

+

{% trans "Mass Mailing Spreadsheet" %}

-Spreadsheets for users in the following organizations: +{% trans "Spreadsheets for users in the following organizations:" %}

{% url correspondence.mass_mailing_spreadsheet as base %}

- All users in: + {% trans "All users in" %}: {% for org in orgs %}{{ org.name }}{% if not forloop.last %}, {% endif %}{% endfor %}

    -
  • In prison: In the system, with returned license agreement or without.
    • -
  • Invitable: On the waitlist or not yet waitlisted -- we could send them an invitation.
    • -
  • Waitlistable: We have their name, but we haven't invited them, nor have we sent a waitlist postcard.
    • -
  • Waitlisted: We have sent them a waitlist postcard, and we haven't sent an invitation.
    • +
  • + + {% trans "In prison" %} + : + {% trans "In the system, with returned license agreement or without." %} +
    • +
  • + + {% trans "Invitable" %} + : + {% trans "On the waitlist or not yet waitlisted -- we could send them an invitation." %} +
    • +
  • + + {% trans "Waitlistable" %} + : + {% trans "We have their name, but we haven't invited them, nor have we sent a waitlist postcard." %} +
    • +
  • + + {% trans "Waitlisted" %} + : + {% trans "We have sent them a waitlist postcard, and we haven't sent an invitation." %} +

- Invited users in: + {% trans "Invited users in" %}: {% for org in orgs %}{{ org.name }}{% if not forloop.last %}, {% endif %}{% endfor %}

{% endblock %} diff --git a/scanblog/templates/correspondence/pending.html b/scanblog/templates/correspondence/pending.html index 95dac09..10a9fee 100644 --- a/scanblog/templates/correspondence/pending.html +++ b/scanblog/templates/correspondence/pending.html @@ -3,61 +3,81 @@ {% block title %}{% trans "Manage correspondence" %}{% endblock %} {% block header %} -

Pending correspondence

+

{% trans "Pending correspondence" %}

{% csrf_token %} -
+
- Refreshes all 'automatic' pending correspondence. + {% trans "Refreshes all 'automatic' pending correspondence." %}

{% csrf_token %} -
+
+ {% blocktrans %} Generates "waitlist" postcards for all consent requests that haven't received them. + {% endblocktrans %}

- - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + +
Collated mailings:
- - - -
{% trans "Collated mailings:" %}
+ + + +
+ +
-

Mailings:

+

{% trans "Mailings:" %}

{% endblock %} diff --git a/scanblog/templates/correspondence/show_commentmailing.html b/scanblog/templates/correspondence/show_commentmailing.html index 1c43ce6..b44cdb7 100644 --- a/scanblog/templates/correspondence/show_commentmailing.html +++ b/scanblog/templates/correspondence/show_commentmailing.html @@ -6,17 +6,35 @@ display: none !important; } -

Recent comments left for {{ letter.recipient.profile }}

+

+ {% blocktrans with recipient_profile=letter.recipient.profile %} + Recent comments left for {{ recipient_profile }} + {% endblocktrans %} +

{% for comment in comments %} {% with comment.document as post %} {% if post.status == "published" %} {% ifchanged post %} {% include "blogs/_post_title_line.html" %} -

Excerpt

+

{% trans "Excerpt" %}

{% include "blogs/_post_highlight.html" %} -

Reply ID: {{ post.reply_code.code }}

-

To reply to these comments, please print the following “reply ID” at the top of the page: {{ post.reply_code.code }}. This will allow us to notify the comment authors that you have written a response. Please only include one reply ID at a time – to reply to more than one set of comments, use a separate page.

-

Comments

+

+ {% trans "Reply ID" %}: + {{ post.reply_code.code }} +

+

+ {% blocktrans %} + To reply to these comments, please print the + following “reply ID” at the top of + the page: {{ + post.reply_code.code }}. This will allow us + to notify the comment authors that you have + written a response. Please only include one + reply ID at a time – to reply to more than + one set of comments, use a separate page. + {% endblocktrans %} +

+

{% trans "Comments" %}

{% endifchanged %} {% include "comments/_comment.html" %} {% endif %} diff --git a/scanblog/templates/correspondence/waitlist-postcard.txt b/scanblog/templates/correspondence/waitlist-postcard.txt index cf333b7..2f629fe 100644 --- a/scanblog/templates/correspondence/waitlist-postcard.txt +++ b/scanblog/templates/correspondence/waitlist-postcard.txt @@ -1,5 +1,7 @@ +{% blocktrans %} Thank you for your request to join the {{ site.name }} blog. We have been overwhelmed by requests from writers all across the country. Unfortunately, this demand has outpaced our ability to process the mail from our currently registered writers. In order to continue to meet our obligations to them, we have begun to add all new requests to a wait-list. Invitations are sent as space is available in the order requests were received. At this time, we don't have an estimate for how long the wait is. We've added your name and address and will send you the registration materials as soon as we are able to. Please don't send us any posts or profiles until you have received them. Thanks for your patience. +{% endblocktrans %} {{ letter.org.mailing_address }} From 82433958edc80811ac1338fbfa05c5576d6fb5b5 Mon Sep 17 00:00:00 2001 From: Arthur Lutz Date: Wed, 11 Jul 2012 21:02:25 +0200 Subject: [PATCH 18/53] i18n round on templates/comments --- scanblog/templates/comments/_comment.html | 124 ++++++++++-------- .../templates/comments/_comment_form.html | 34 ++--- .../templates/comments/delete_comment.html | 8 +- scanblog/templates/comments/edit_comment.html | 12 +- scanblog/templates/comments/preview.html | 51 +++---- 5 files changed, 128 insertions(+), 101 deletions(-) diff --git a/scanblog/templates/comments/_comment.html b/scanblog/templates/comments/_comment.html index 13c141a..ce098b7 100644 --- a/scanblog/templates/comments/_comment.html +++ b/scanblog/templates/comments/_comment.html @@ -1,55 +1,69 @@ -
- -
- - - - - - -
- {% if comment.user.has_public_profile %} - {{ comment.user.profile }} - {% else %} - {{ comment.user.profile }} - {% endif %} - - Posted {{ comment.created|timesince }} ago. - {% if comment.letter_sent %} - - ✓ - Mailed {{ comment.letter_sent|timesince }} ago - - {% endif %} - - {% if perms.change_comment or user == comment.user and not comment.letter_sent %} - editdelete - {% endif %} - {% if user != comment.user %} -   - {% endif %} -
-
-
- {% if comment.comment_doc_id %} - {% with post=comment.comment_doc %} - (scanned reply – view as blog post) - {% with documentpages=post.documentpage_set.all %} - {% with documentpage_count=documentpages.count %} - {% include "blogs/_post_pages.html" %} - {% endwith %} - {% endwith %} - {% endwith %} - {% else %} - {{comment.comment|linebreaksbr}} - {% endif %} -
-
-
+
+ +
+ + + + + + +
+ {% if comment.user.has_public_profile %} + + {{ comment.user.profile }} + + {% else %} + {{ comment.user.profile }} + {% endif %} + + + {% blocktrans with created_since=comment.created|timesince } + Posted {{ created_since }} ago. + {% endblocktrans %} + + {% if comment.letter_sent %} + + ✓ + {% blocktrans with mailed_since=comment.letter_sent|timesince } + Mailed {{ mailed_since }} ago + {% endblocktrans %} + + {% endif %} + + {% if perms.change_comment or user == comment.user and not comment.letter_sent %} + + {% trans "edit" %} + + + {% trans "delete" %} + + {% endif %} + {% if user != comment.user %} +   + {% endif %} +
+
+
+ {% if comment.comment_doc_id %} + {% with post=comment.comment_doc %} + ({% trans "scanned reply" %} – + {% trans "view as blog post" %} + ) + {% with documentpages=post.documentpage_set.all %} + {% with documentpage_count=documentpages.count %} + {% include "blogs/_post_pages.html" %} + {% endwith %} + {% endwith %} + {% endwith %} + {% else %} + {{comment.comment|linebreaksbr}} + {% endif %} +
+
+
diff --git a/scanblog/templates/comments/_comment_form.html b/scanblog/templates/comments/_comment_form.html index 2994fe0..8b4ae42 100644 --- a/scanblog/templates/comments/_comment_form.html +++ b/scanblog/templates/comments/_comment_form.html @@ -2,23 +2,25 @@

- {% if post.author.profile.managed %} - We will print and mail your reply by . - {% endif %} - Guidelines

+ {% if post.author.profile.managed %} + {% blocktrans %} + We will print and mail your reply by . + {% endblocktrans %} + {% endif %} + {% trans "Guidelines" %}
-
{% csrf_token %} - {% if comment_form.comment.errors %} -

{{ comment_form.comment.errors }}

- {% endif %} - {{ comment_form.comment }} - {{ comment_form.honey }} -
- -
-
+
{% csrf_token %} + {% if comment_form.comment.errors %} +

{{ comment_form.comment.errors }}

+ {% endif %} + {{ comment_form.comment }} + {{ comment_form.honey }} +
+ +
+
diff --git a/scanblog/templates/comments/delete_comment.html b/scanblog/templates/comments/delete_comment.html index 6df6748..9ee3c71 100644 --- a/scanblog/templates/comments/delete_comment.html +++ b/scanblog/templates/comments/delete_comment.html @@ -1,13 +1,13 @@ {% extends "site_base.html" %} {% block title %}Delete reply{% endblock %} {% block body %} -

Delete reply

-

Are you sure you want to delete this reply? There is no undo.

+

{% trans "Delete reply" %}

+

{% trans "Are you sure you want to delete this reply? There is no undo." %}

{{ comment|linebreaks }}
{% csrf_token %} - - Cancel + + {% trans "Cancel" %}
{% endblock %} diff --git a/scanblog/templates/comments/edit_comment.html b/scanblog/templates/comments/edit_comment.html index 0cbc7ee..5e5846f 100644 --- a/scanblog/templates/comments/edit_comment.html +++ b/scanblog/templates/comments/edit_comment.html @@ -1,8 +1,12 @@ {% extends "site_base.html" %} -{% block title %}Edit comment {% endblock %} +{% block title %}{% trans "Edit comment" %} {% endblock %} {% block body %} -

Edit comment

-

Please consider our guidelines while writing.

+

{% trans "Edit comment" %}

+

+ {% blocktrans with guidelines_url=url about.community_guidelines %} + Please consider our guidelines while writing. + {% endblocktrans %} +

{% csrf_token %}
{% if form.comment.errors %} @@ -10,7 +14,7 @@

Edit comment

{% endif %} {{ form.comment }}
- +
diff --git a/scanblog/templates/comments/preview.html b/scanblog/templates/comments/preview.html index 117807a..1b10a8c 100644 --- a/scanblog/templates/comments/preview.html +++ b/scanblog/templates/comments/preview.html @@ -8,41 +8,48 @@ {% csrf_token %} {% if next %}{% endif %} {% if form.errors %} -

{% blocktrans count form.errors|length as counter %}Please correct the error below{% plural %}Please correct the errors below{% endblocktrans %}

+

+ {% blocktrans count form.errors|length as counter %} + Please correct the error below{% plural %}Please correct the errors below + {% endblocktrans %} +

{% else %}

{% trans "Preview your comment" %}

-
- {{ user.profile }} -
- {% now "Y-m-d" %}
- {% now "h:i a" %} -
-
-
- {{comment|linebreaksbr}} -
-
+
+ {{ user.profile }} +
+ {% now "Y-m-d" %}
+ {% now "h:i a" %} +
+
+
+ {{comment|linebreaksbr}} +
+

- {% trans "and" %} {% trans "or make changes" %}: + {% trans "and" %} + + {% trans "or make changes" %}:

{% endif %} {% for field in form %} {% if field.is_hidden %} - {{ field }} + {{ field }} {% else %} - {% if field.errors %}{{ field.errors }}{% endif %} - + {% if field.errors %}{{ field.errors }}{% endif %} + {% endif %} {% endfor %}

- +

{% endblock %} - From af7f814d8022a4cc06b1e1a11800136a1a6ef525 Mon Sep 17 00:00:00 2001 From: Arthur Lutz Date: Wed, 11 Jul 2012 21:10:44 +0200 Subject: [PATCH 19/53] i18n round on templates/btb --- .../templates/btb/admin-content-flagged.txt | 11 ++++++----- .../btb/admin-email-comment-posted.txt | 17 +++++++++-------- .../btb/admin-email-transcription-edited.txt | 17 +++++++++-------- .../btb/admin-unmanaged-post-notification.txt | 11 ++++++----- .../btb/admin-visitor-profile-notification.txt | 13 +++++++------ 5 files changed, 37 insertions(+), 32 deletions(-) diff --git a/scanblog/templates/btb/admin-content-flagged.txt b/scanblog/templates/btb/admin-content-flagged.txt index 3f06087..4759291 100644 --- a/scanblog/templates/btb/admin-content-flagged.txt +++ b/scanblog/templates/btb/admin-content-flagged.txt @@ -1,14 +1,15 @@ -A flag was created for {{ note.content_object }} by user "{{ note.creator.profile }}". +{% load i18n %} +{% trans "A flag was created for" %} {{ note.content_object }} {% trans "by user" %} "{{ note.creator.profile }}". -Content URL: +{% trans "Content URL" %}: http://{{ site.domain }}{{ note.content_object.get_absolute_url }} -Edit flagging user: +{% trans "Edit flagging user" %}: http://{{ site.domain }}/admin/auth/user/{{ user.id }}/ -Delete flagging user: +{% trans "Delete flagging user" %}: http://{{ site.domain }}/admin/auth/user/{{ user.id }}/delete/ -Note content: +{% trans "Note content" %}: ---- {{ note.text|safe }} ---- diff --git a/scanblog/templates/btb/admin-email-comment-posted.txt b/scanblog/templates/btb/admin-email-comment-posted.txt index 3de6c0d..eedd4d7 100644 --- a/scanblog/templates/btb/admin-email-comment-posted.txt +++ b/scanblog/templates/btb/admin-email-comment-posted.txt @@ -1,6 +1,7 @@ -A comment has been posted on {{ comment.document.get_title }}: +{% load i18n %} +{% trans "A comment has been posted on" %} {{ comment.document.get_title }}: -View on site: +{% trans "View on site" %}: http://{{ site.domain }}{{ comment.get_absolute_url }} {{ comment.user.profile }} @@ -8,11 +9,11 @@ http://{{ site.domain }}{{ comment.get_absolute_url }} {{ comment.comment|safe }} ---- -Moderation functions: -Delete: -Edit: +{% trans "Moderation functions" %}: +{% trans "Delete" %}: +{% trans "Edit" %}: -Admin functions: -Edit user: -Delete user: +{% trans "Admin functions" %}: +{% trans "Edit user" %}: +{% trans "Delete user" %}: {# Can't use base_url here because we can't get RequestContext #} diff --git a/scanblog/templates/btb/admin-email-transcription-edited.txt b/scanblog/templates/btb/admin-email-transcription-edited.txt index 4c36b8b..10c4493 100644 --- a/scanblog/templates/btb/admin-email-transcription-edited.txt +++ b/scanblog/templates/btb/admin-email-transcription-edited.txt @@ -1,17 +1,18 @@ -The transcription for {{ document.type }} by {{ document.author.profile }} was edited by user: {{ revision.editor.profile }} +{% load i18n %} +{% trans "The transcription for" %} {{ document.type }} {% trans "by" %} {{ document.author.profile }} {% trans "was edited by user" %}: {{ revision.editor.profile }} -Actions: +{% trans "Actions" %}: -Diff: +{% trans "Diff" %}: http://{{ site.domain }}{% url scanning.revision_list document.id %} -Edit transcription: +{% trans "Edit transcription" %}: http://{{ site.domain }}{% url scanning.transcribe_document document.id %} -View document: +{% trans "View document" %}: http://{{ site.domain }}{{ document.get_absolute_url }} -Admin functions: -Edit user: http://{{ site.domain }}/admin/auth/user/{{ revision.editor.id }}/ -Delete user: http://{{ site.domain }}/admin/auth/user/{{ revision.editor.id }}/delete +{% trans "Admin functions" %}: +{% trans "Edit user" %}: http://{{ site.domain }}/admin/auth/user/{{ revision.editor.id }}/ +{% trans "Delete user" %}: http://{{ site.domain }}/admin/auth/user/{{ revision.editor.id }}/delete ---- {{ revision.body|safe }} diff --git a/scanblog/templates/btb/admin-unmanaged-post-notification.txt b/scanblog/templates/btb/admin-unmanaged-post-notification.txt index 3bed68f..d637e26 100644 --- a/scanblog/templates/btb/admin-unmanaged-post-notification.txt +++ b/scanblog/templates/btb/admin-unmanaged-post-notification.txt @@ -1,14 +1,15 @@ -A blog post was added or edited by user {{ document.author.profile }}. +{% load i18n %} +{% trans "A blog post was added or edited by user" %} {{ document.author.profile }}. -View post: +{% trans "View post" %}: -Edit user: +{% trans "Edit user" %}: -Edit user in admin: +{% trans "Edit user in admin" %}: {{ document.title|safe }} ---- {{ document.body|safe }} ---- -Tags: {{ document.tags.all|join:", " }} +{% trans "Tags" %}: {{ document.tags.all|join:", " }} diff --git a/scanblog/templates/btb/admin-visitor-profile-notification.txt b/scanblog/templates/btb/admin-visitor-profile-notification.txt index bc3ce91..9835d7c 100644 --- a/scanblog/templates/btb/admin-visitor-profile-notification.txt +++ b/scanblog/templates/btb/admin-visitor-profile-notification.txt @@ -1,13 +1,14 @@ -A profile PDF was uploaded by user {{ document.author.profile }}: +{% load i18n %} +{% trans "A profile PDF was uploaded by user" %} {{ document.author.profile }}: -View on site: +{% trans "View on site" %}: http://{{ site.domain }}{{ document.author.profile.get_aboslute_url }} -Edit user: +{% trans "Edit user" %}: http://{{ site.domain }}{{ document.author.profile.get_edit_url }} -Admin functions: -Edit user in admin: +{% trans "Admin functions" %}: +{% trans "Edit user in admin" %}: http://{{ site.domain }}/admin/auth/user/{{ comment.user.id }}/ -Delete user: +{% trans "Delete user" %}: http://{{ site.domain }}/admin/auth/user/{{ comment.user.id }}/delete From 2f43c012afede4794ef641df4df39e7674aa8acb Mon Sep 17 00:00:00 2001 From: Arthur Lutz Date: Fri, 3 Aug 2012 09:39:08 +0200 Subject: [PATCH 20/53] correction error while trying to extract i18n po --- scanblog/templates/about/faq.html | 4 ++-- scanblog/templates/about/index.html | 14 +++++++------- scanblog/templates/about/privacy.html | 6 +++--- scanblog/templates/about/terms.html | 4 ++-- scanblog/templates/correspondence/.#base.html | 1 - .../correspondence/.#created-packet-template.tex | 1 - .../templates/notification/notice_settings.html | 2 +- scanblog/templates/profiles/profile_detail.html | 2 +- 8 files changed, 16 insertions(+), 18 deletions(-) delete mode 120000 scanblog/templates/correspondence/.#base.html delete mode 120000 scanblog/templates/correspondence/.#created-packet-template.tex diff --git a/scanblog/templates/about/faq.html b/scanblog/templates/about/faq.html index 98da903..cf5986d 100644 --- a/scanblog/templates/about/faq.html +++ b/scanblog/templates/about/faq.html @@ -5,9 +5,9 @@ {% block body %}

{% trans "Frequently Asked Questions" %}

-

{% blocktrans %} +

{% blocktrans with about_community_guidelines=url about_community_guidelines %} Please also see the - community guidelines + community guidelines for commenting and transcribing posts. {% endblocktrans %}

diff --git a/scanblog/templates/about/index.html b/scanblog/templates/about/index.html index a5f09f9..01e1bd3 100644 --- a/scanblog/templates/about/index.html +++ b/scanblog/templates/about/index.html @@ -58,25 +58,25 @@

{% trans "Leave comments" %}

- {% blocktrans %} + {% blocktrans with url_registration_register=url registration_register url_auth_login=url auth_login %} Registered users can comment on blog posts. We periodically mail comment feeds back to the authors so they can hear from their fans and continue the discussion. - Sign up and - log in today! + Sign up and + log in today! {% endblocktrans %}

{% trans "Transcribe posts" %}

- {% blocktrans %} + {% blocktrans with url_registration_register=url registration_register url_auth_login=url auth_login %} {{ site.name }} relies on visitors to transcribe its bloggers' posts. You can help us out by - signing up and - logging in, + signing up and + logging in, and starting to transcribe posts that interest you. Transcriptions make the blogs more accessible to search engines, translators and visitors. - {% blocktrans %} + {% endblocktrans %}



diff --git a/scanblog/templates/about/privacy.html b/scanblog/templates/about/privacy.html index d6ca82c..a53f1ea 100644 --- a/scanblog/templates/about/privacy.html +++ b/scanblog/templates/about/privacy.html @@ -14,14 +14,14 @@

{% blocktrans %} PLEASE REVIEW BEFORE USING THIS WEBSITE – IF YOU DO NOT AGREE WITH ALL OF THE TERMS OF THE BTB PRIVACY POLICY, DO NOT USE THIS WEBSITE. - {% blocktrans %} + {% endblocktrans %}

- {% blocktrans %} + {% blocktrans with url_home=url home %}

The following discloses the information gathering and dissemination practices for the Between the Bars (“BtB”) website available at -http://betweenthebars.org (the “Site”). +http://betweenthebars.org (the “Site”). Your use of the Site constitutes your agreement to this privacy policy and consent to the terms herein.

diff --git a/scanblog/templates/about/terms.html b/scanblog/templates/about/terms.html index 8e7931d..8994e7a 100644 --- a/scanblog/templates/about/terms.html +++ b/scanblog/templates/about/terms.html @@ -155,7 +155,7 @@

Privacy

BtB respects the privacy of our users. BtB’s Privacy Policy is expressly incorporated herein by reference and made a part of the Terms. The Privacy Policy is located at -{{ base_url }}{% url about.privacy %}. +{{ base_url }}{{ url_about_privacy }}.

Termination of Account

@@ -251,7 +251,7 @@

Digital Millenium Copyright Act/Copyright Infringement and Notification Poli copyrighted materials have been copied in a way that constitutes copyright infringement, please follow the procedure set forth in our Digital Millennium Copyright Act Notice Policy, which is located at -{{ base_url }}{% url about.dmca %} and is +{{ base_url }}{{ url_about_dmca }} and is expressly incorporated herein by reference and made a part of the Terms.

Termination of Service

diff --git a/scanblog/templates/correspondence/.#base.html b/scanblog/templates/correspondence/.#base.html deleted file mode 120000 index 8cdbaf3..0000000 --- a/scanblog/templates/correspondence/.#base.html +++ /dev/null @@ -1 +0,0 @@ -arthur@draco.logilab.fr.7001:1341989713 \ No newline at end of file diff --git a/scanblog/templates/correspondence/.#created-packet-template.tex b/scanblog/templates/correspondence/.#created-packet-template.tex deleted file mode 120000 index 8cdbaf3..0000000 --- a/scanblog/templates/correspondence/.#created-packet-template.tex +++ /dev/null @@ -1 +0,0 @@ -arthur@draco.logilab.fr.7001:1341989713 \ No newline at end of file diff --git a/scanblog/templates/notification/notice_settings.html b/scanblog/templates/notification/notice_settings.html index 8de047d..200218e 100644 --- a/scanblog/templates/notification/notice_settings.html +++ b/scanblog/templates/notification/notice_settings.html @@ -30,7 +30,7 @@

{% trans "Communication preferences" %}

{% blocktrans %} To ensure our emails are not delivered to your spam folder, please add {{ from_email }} to your address book. - {% enblocktrans %} + {% endblocktrans %}

{% trans "Subscriptions" %}

diff --git a/scanblog/templates/profiles/profile_detail.html b/scanblog/templates/profiles/profile_detail.html index d346840..abfe718 100644 --- a/scanblog/templates/profiles/profile_detail.html +++ b/scanblog/templates/profiles/profile_detail.html @@ -9,7 +9,7 @@

- {% blocktrans %}{{profile}}'s profile{% blocktrans %} + {% blocktrans %}{{profile}}'s profile{% endblocktrans %}

{% include "blogs/_sharing_buttons.html" %}
{% if org.public %}{{ org.footer|safe }}{% endif %}
From 40a49169650b7e5fe18e5305781c5bc9efb2991f Mon Sep 17 00:00:00 2001 From: Arthur Lutz Date: Mon, 6 Aug 2012 07:12:20 +0200 Subject: [PATCH 21/53] i18n corrections in templates --- scanblog/templates/profiles/profile_detail.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scanblog/templates/profiles/profile_detail.html b/scanblog/templates/profiles/profile_detail.html index abfe718..b0f66ca 100644 --- a/scanblog/templates/profiles/profile_detail.html +++ b/scanblog/templates/profiles/profile_detail.html @@ -71,9 +71,10 @@

{% trans "Transcription" %}

{% blocktrans %} - Read more from {{ profile }}'s blog{% if profile.blog_name %}: - {{ profile.blog_name }}{% endif %} » + Read more from {{ profile }}'s blog {% endblocktrans %} + {% if profile.blog_name %}: + {{ profile.blog_name }}{% endif %} »

{% else %}{% if not profile.managed %} From 16305744716cfd6f4865a6b7f0e9ced90cd59332 Mon Sep 17 00:00:00 2001 From: Arthur Lutz Date: Mon, 6 Aug 2012 07:12:56 +0200 Subject: [PATCH 22/53] extraction of new i18n strings --- scanblog/locale/en/LC_MESSAGES/django.po | 2592 +++++++++++++++++++- scanblog/locale/fr/LC_MESSAGES/django.po | 2798 ++++++++++++++++++++-- 2 files changed, 5151 insertions(+), 239 deletions(-) diff --git a/scanblog/locale/en/LC_MESSAGES/django.po b/scanblog/locale/en/LC_MESSAGES/django.po index 115cba6..68de7a6 100644 --- a/scanblog/locale/en/LC_MESSAGES/django.po +++ b/scanblog/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-31 15:43+0200\n" +"POT-Creation-Date: 2012-08-06 07:07+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -47,7 +47,7 @@ msgstr "" msgid "Comments on '%s'" msgstr "" -#: btb/models.py:21 +#: btb/models.py:21 templates/notification/new_reply/notice.html:1 msgid "New reply" msgstr "" @@ -55,7 +55,7 @@ msgstr "" msgid "new reply to a post you're following" msgstr "" -#: btb/models.py:25 +#: btb/models.py:25 templates/notification/new_post/notice.html:1 msgid "New post" msgstr "" @@ -142,23 +142,23 @@ msgid "" "org'>http://betweenthebars.org." msgstr "" -#: templates/_pagination.html:2 +#: templates/_pagination.html:3 msgid "Page:" msgstr "" -#: templates/_pagination.html:4 +#: templates/_pagination.html:5 msgid "Previous page" msgstr "" -#: templates/_pagination.html:4 +#: templates/_pagination.html:5 msgid "Previous" msgstr "" -#: templates/_pagination.html:10 +#: templates/_pagination.html:11 msgid "Next page" msgstr "" -#: templates/_pagination.html:10 +#: templates/_pagination.html:11 msgid "Next" msgstr "" @@ -174,39 +174,54 @@ msgstr "" msgid "Human stories from prison" msgstr "" -#: templates/home.html:25 +#: templates/home.html:19 +#, python-format +msgid "" +"is a weblog platform for people in prison, through which the 1% of Americans " +"who are in prison can tell their stories. Leave a comment – we'll pass " +"it on." +msgstr "" + +#: templates/home.html:24 msgid "Gives voice to the voiceless." msgstr "" -#: templates/home.html:29 +#: templates/home.html:28 msgid "... encourages inmates to retain their individual identities ..." msgstr "" -#: templates/home.html:33 +#: templates/home.html:32 msgid "Amazing stuff." msgstr "" -#: templates/home.html:63 templates/blogs/_blog_cloud.html:60 +#: templates/home.html:38 templates/feeds/_featured.html:1 +#: templates/feeds/_subscriptions.html:66 +msgid "Featured posts" +msgstr "" + +#: templates/home.html:62 templates/blogs/_blog_cloud.html:61 msgid "Recent comments" msgstr "" -#: templates/home.html:66 +#: templates/home.html:65 templates/moderation/_scans.html:20 +#: templates/scanning/_column_diff.html:5 +#: templates/scanning/_column_diff.html:7 msgid "ago" msgstr "" -#: templates/home.html:68 +#: templates/home.html:67 templates/moderation/_notes.html:50 msgid "By" msgstr "" -#: templates/home.html:68 templates/blogs/_blog_cloud.html:64 +#: templates/home.html:67 templates/blogs/_blog_cloud.html:65 msgid "on" msgstr "" -#: templates/home.html:76 +#: templates/home.html:75 msgid "Join the conversation!" msgstr "" -#: templates/home.html:77 +#: templates/home.html:76 msgid "Head on over to the blogs." msgstr "" @@ -226,7 +241,8 @@ msgstr "" msgid "Moderation" msgstr "" -#: templates/site_base.html:45 +#: templates/site_base.html:45 templates/scanning/merge.html:9 +#: templates/scanning/replace.html:9 templates/scanning/upload.html:11 msgid "Upload" msgstr "" @@ -250,7 +266,7 @@ msgstr "" msgid "or" msgstr "" -#: templates/site_base.html:86 +#: templates/site_base.html:86 templates/profiles/groups_list.html:24 msgid "Join" msgstr "" @@ -262,7 +278,8 @@ msgstr "" msgid "Copyrights" msgstr "" -#: templates/site_base.html:124 templates/about/terms.html:4 +#: templates/site_base.html:124 templates/about/terms.fr.html:4 +#: templates/about/terms.html:4 msgid "Terms of Use" msgstr "" @@ -279,69 +296,1369 @@ msgid "Community Guidelines" msgstr "" #: templates/about/about_base.html:11 templates/about/faq.html:4 +#: templates/about/faq.html.py:7 msgid "Frequently Asked Questions" msgstr "" +#: templates/about/about_base.html:12 +msgid "News" +msgstr "" + #: templates/about/about_base.html:13 msgid "Mailing list" msgstr "" +#: templates/about/faq.html:8 +#, python-format +msgid "" +"\n" +" Please also see the\n" +" community guidelines\n" +" for commenting and transcribing posts.\n" +" " +msgstr "" + +#: templates/about/faq.html:15 +msgid "Who is behind this?" +msgstr "" + +#: templates/about/faq.html:17 +msgid "" +"\n" +" Between the Bars was founded by Charlie DeTar and Benjamin Mako Hill. " +"It is operated by Charlie DeTar and volunteers and staff in the Center for Civic Media at MIT.\n" +"\t" +msgstr "" + +#: templates/about/faq.html:21 +msgid "Why blogging?" +msgstr "" + +#: templates/about/get_involved.html:2 +msgid "Get involved" +msgstr "" + +#: templates/about/get_involved.html:4 +msgid "comment ... volunteer ... process mail ..." +msgstr "" + +#: templates/about/index.html:16 +#, python-format +msgid "" +"\n" +"\tUS Correctional Populations\n" +"\t
\n" +"\t
\n" +"\t Source:\n" +"\t \n" +"\t Citizenship, Democracy, and the Civic Reintegration of Criminal " +"Offenders\n" +"\t \n" +"\t
\n" +"\t
\n" +"\tWhen Prisoners Come Home\n" +"\t
\n" +"\t
\n" +"\t Source:\n" +"\t \n" +"\t When prisoners come home: parole and prisoner reentry\n" +"\t \n" +"\t by Joan Petersilia\n" +"\t
\n" +"\t
\n" +" " +msgstr "" + +#: templates/about/index.html:41 +#, python-format +msgid "" +"\n" +" About %(site.name)s\n" +" " +msgstr "" + +#: templates/about/index.html:46 +#, python-format +msgid "" +"\n" +" %(site.name)s is a weblog platform for people in\n" +" prison, through which the 1%% of America which is behind bars can tell " +"their\n" +" stories. Since people in prison are routinely denied access to the\n" +" Internet, we enable them to blog by scanning letters. We aim to provide " +"a\n" +" positive outlet for creativity, a tool to assist in the maintenance of\n" +" social safety nets, an opportunity to forge connections between people\n" +" inside and outside of prison, and a means to promote non-criminal\n" +" identities and personal expression. We hope to improve prisoner's " +"lives,\n" +" and help to reduce recidivism.\n" +" " +msgstr "" + +#: templates/about/index.html:59 +msgid "Leave comments" +msgstr "" + +#: templates/about/index.html:61 +#, python-format +msgid "" +"\n" +"\tRegistered users can comment on blog posts. We periodically mail\n" +"\tcomment feeds back to the authors so they can hear from their fans and\n" +"\tcontinue the discussion.\n" +"\tSign up and\n" +"\tlog in today!\n" +" " +msgstr "" + +#: templates/about/index.html:69 +msgid "Transcribe posts" +msgstr "" + +#: templates/about/index.html:71 +#, python-format +msgid "" +"\n" +"\t%(site.name)s relies on visitors to transcribe its bloggers' posts.\n" +"\tYou can help us out by\n" +"\tsigning up and\n" +"\tlogging in,\n" +"\tand starting to transcribe posts that interest you. Transcriptions\n" +"\tmake the blogs more accessible to search engines, translators and\n" +"\tvisitors.\n" +" " +msgstr "" + +#: templates/about/index.html:85 +#, python-format +msgid "" +"\n" +"\tCenter for Civic Media\n" +" " +msgstr "" + +#: templates/about/index.html:90 +#, python-format +msgid "" +"\n" +" %(site.name)s is supported by generous sponsorship from the\n" +" Center for Civic Media at MIT.\n" +" " +msgstr "" + +#: templates/about/privacy.html:8 +msgid "" +"\n" +" Between the Bars Privacy Policy\n" +" " +msgstr "" + +#: templates/about/privacy.html:14 +msgid "" +"\n" +" PLEASE REVIEW BEFORE USING THIS WEBSITE – IF YOU DO NOT AGREE WITH ALL " +"OF\n" +" THE TERMS OF THE BTB PRIVACY POLICY, DO NOT USE THIS WEBSITE.\n" +" " +msgstr "" + +#: templates/about/privacy.html:20 +#, python-format +msgid "" +"\n" +"

\n" +"The following discloses the information gathering and dissemination\n" +"practices for the Between the Bars (“BtB”) website available at\n" +"http://betweenthebars.org (the “Site”).\n" +"Your use of the Site constitutes your agreement to this privacy policy\n" +"and consent to the terms herein.\n" +"

\n" +"\n" +"

\n" +"BtB reserves the right to modify the information contained herein from time " +"to\n" +"time, with or without notice, so please check it regularly for any changes " +"or\n" +"updates. Your continued use of the Site after BtB has posted a modified\n" +"version of its privacy policy signifies your acceptance of the revised " +"privacy\n" +"policy.\n" +"

\n" +"\n" +"

Information We Collect and How We Use It

\n" +"
\n" +"
Normal Browsing
\n" +"

When you browse the Site, BtB collects data, including but\n" +"not limited to the public source IP address of the request, the domain name " +"and\n" +"host from which the user accessed the Internet (e.g., aol.com), the user’s\n" +"browser software and operating system, the date and time the user accesses " +"the\n" +"Site, web pages previously visited by the user, the web site to which the " +"user\n" +"links after visiting our Site, and user queries submitted to the Site. \n" +"

\n" +"

\n" +"We use this information to generate statistics and measure Site activity, " +"which\n" +"helps us better understand our visitors and make the Site more useful to " +"them. \n" +"

\n" +"
\n" +"\n" +"
Information You Provide
\n" +"

In order to make any edits to the Site, including flagging offensive\n" +"content, accessing offensive content, writing or editing transcriptions,\n" +"posting comments to letters, and/or creating a user profile you will need " +"to\n" +"register and create an account by providing an email address, username, and\n" +"password. If you create an account, you may, but you are not required to\n" +"create a user profile by uploading a photo of yourself and/or providing a\n" +"description of yourself. If you create an account, BtB collects and stores " +"the\n" +"email address, username, and password that you provide as well as any\n" +"information you voluntarily provide in your profile. BtB also collects and\n" +"stores information tied to all public content provided by users and user\n" +"activity on the Site.

\n" +"\n" +"
BtB’s Disclosure of Your Information
\n" +"

Available log records, account information, and all data stored on " +"our\n" +"servers may be accessed by our system administrators. BtB may need to " +"disclose\n" +"this information to law enforcement or other government officials for your\n" +"protection or in connection with an investigation of fraud, intellectual\n" +"property infringement, or other activity that is illegal or may expose us " +"or\n" +"our users to legal liability, and as otherwise deemed reasonably necessary " +"by\n" +"BtB.\n" +"

\n" +"

BtB also may provide aggregated, de-identified data or reports on user " +"demographics and behavior to interested third parties, including but not " +"limited to journals and academics.\n" +"

\n" +"

\n" +"Additionally, making edits to the Site is a public action, and all content " +"may\n" +"be publicly visible. Identification of all contributed content may " +"include,\n" +"but is not limited to display of your username and any other information or\n" +"pictures that you provide in your profile. All content may be retained for\n" +"restorative, archival, or research purposes by BtB. All unsolicited\n" +"information shall be deemed to be non-confidential and BtB shall be free to\n" +"reproduce, use, disclose, and distribute such unsolicited information to " +"others\n" +"without limitation or attribution. Permissible distribution of your " +"content\n" +"includes but is not limited to the sending of your comments by BtB to\n" +"prisoners.\n" +"

\n" +"
\n" +"

Control of Your Password

\n" +"\n" +"

\n" +"You may not disclose your BtB password to any third parties nor share it " +"with\n" +"any third parties. If your password has been compromised for any reason, " +"you\n" +"should immediately change your password.\n" +"

\n" +"\n" +"

Modification of Privacy Policy

\n" +"

\n" +"BtB reserves the right to revise this privacy policy from time to time, with " +"or\n" +"without notice, so please check it regularly for any changes or updates. " +"Your\n" +"continued use of the Site after BtB has posted a modified version of its\n" +"privacy policy signifies your acceptance of the revised privacy policy.\n" +"

\n" +"\n" +"

Contacting BtB

\n" +"

\n" +"If you have any questions regarding this privacy policy, you can contact us " +"by\n" +"emailing info@betweenthebars.org.\n" +"

\n" +"\n" +"

\n" +"Effective Date of the Agreement is 2010-11-15.\n" +"

\n" +msgstr "" + #: templates/about/resources.html:4 msgid "Resources" msgstr "" -#: templates/blogs/_blog_cloud.html:5 +#: templates/about/terms.fr.html:7 templates/about/terms.html:7 +msgid "Between the Bars Terms of Use" +msgstr "" + +#: templates/about/terms.fr.html:9 templates/about/terms.html:9 +msgid "" +"\n" +" PLEASE REVIEW BEFORE USING THIS WEBSITE – IF YOU DO NOT AGREE TO " +"THESE TERMS OF USE, DO NOT USE THIS WEBSITE.\n" +msgstr "" + +#: templates/about/terms.fr.html:13 +#, python-format +msgid "" +"\n" +"

General

\n" +"

\n" +"Le site Expression Carcerale (\"EC\") est une plateforme de blog pour\n" +"les personnes incarcérées qui n'ont pas ou un accès limité aux médias\n" +"de publication. La mission du site est de faciliter la communication\n" +"entre les prisonniers et le public à travers le site disponible à\n" +"l'adresse suivante : %(base_url)s (\"le site\").\n" +"

\n" +"\n" +"

\n" +"Pour permettre à EC d'opérer ce service de manière effective et\n" +"responsable, nous avons écrit des règles de bon fonctionnement à\n" +"destination des utilisateurs du site. En consultant, utilisant et\n" +"contribuant à ce site par quelqueconque moyen, vous agréez à ces\n" +"règles de bon fonctionnement. Ces termes lient juridiquement\n" +"l'utilisateur et les opérateurs du site EC.\n" +"

\n" +"\n" +"

\n" +"XXX suppr ? ou au moins notification aux utilisateurs inscrits.\n" +"FIXME s/Membre/Usager/\n" +"\n" +"Les règles énoncées ici peuvent être modifiées avec le temps. Nous\n" +"nous efforcerons de communiquer les nouveaux termes aux utilisateurs\n" +"inscrits. Pour les utilisateurs non-inscrits, ceux-ci devront\n" +"consulter régulièrement ces termes pour prendre connaissance des\n" +"nouvelles versions.\n" +"\n" +"BtB may modify the Terms from time to time, at BtB’s discretion, and such\n" +"modifications shall be effective upon posting by BtB on the Site. Your\n" +"continued use of the Site after BtB posts revised Terms signifies your\n" +"acceptance of the revised Terms. It is therefore important that you review " +"the\n" +"Terms regularly to ensure you are updated as to any changes.\n" +"

\n" +"\n" +"

\n" +"Merci de votre compréhension et nous nous tenons à votre disposition\n" +"pour toute question relative à ces conditions d'utilisation.\n" +"

\n" +"\n" +"

\n" +"Les Conditions d'Utilisation du Site et ces services :\n" +"

\n" +"\n" +"

Disclaimer and Waiver of Certain Damages

\n" +"

\n" +"THE SITE AND CONTENT AND SERVICES OFFERED AT, THROUGH, OR IN CONNECTION " +"WITH\n" +"THE SITE ARE PROVIDED ON AN \"AS IS\" AND \"AS AVAILABLE\" BASIS WITHOUT " +"WARRANTIES\n" +"OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO " +"WARRANTIES\n" +"OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR\n" +"OTHERWISE. WITHOUT LIMITATION, WE DISCLAIM ANY AND ALL WARRANTIES REGARDING " +"THE\n" +"SECURITY, RELIABILITY, TIMELINESS AND PERFORMANCE OF THE SERVICES OFFERED. " +"WE\n" +"MAKE NO WARRANTY, EXPRESS OR IMPLIED, THAT THE BTB SITE, THE CONTENT ON THE\n" +"SITE, AND THE SERVICES WILL BE UNINTERRUPTED, TIMELY OR ERROR-FREE. SOME\n" +"JURISDICTIONS DO NOT ALLOW THE DISCLAIMER OF CERTAIN WARRANTIES, SO SOME OF " +"THE\n" +"ABOVE DISCLAIMER MAY NOT APPLY TO YOU.\n" +"\n" +"Le Service est proposé \" tel que \" sans garantie de quelque nature que\n" +"ce soit, explicite ou implicite ou que le fonctionnement de la\n" +"Plateforme soit ininterrompu, rapide, sécurisé.\n" +"\n" +"

\n" +"

\n" +"TO THE EXTENT NOT PROHIBITED BY APPLICABLE LAW, IN NO EVENT SHALL BTB BE " +"LIABLE\n" +"FOR ANY DIRECT, INDIRECT, SPECIAL, OR CONSEQUENTIAL DAMAGES, REGARDLESS OF " +"THE\n" +"NATURE OF THE CLAIM OR THE FORM OF ACTION, ARISING FROM THE CONTENT ON THE\n" +"SITE, THE SERVICES, OR THE SITE, WHETHER OR NOT WE SHALL HAVE HAD ANY\n" +"KNOWLEDGE, ACTUAL OR CONSTRUCTIVE, THAT SUCH DAMAGES MIGHT BE INCURRED.\n" +"

\n" +"\n" +"

Eligibilité

\n" +"

\n" +"You must be 18 years of age or older to use this Site. By using the Site, " +"you\n" +"represent and warrant that you are 18 years of age or older.\n" +"

\n" +"\n" +"

Account, Password and Security

\n" +"

\n" +"You may create an account with BtB by providing a username and password.\n" +"Creating an account will allow you to create a user profile and make\n" +"contributions to the Site, including but not limited to posting comments " +"and\n" +"participating in the transcription process. Through the transcription " +"process,\n" +"accountholders may transcribe posted letters from the prisoners, and/or " +"edit\n" +"existing transcriptions to correct errors.\n" +"

\n" +"\n" +"

\n" +"You are solely responsible for maintaining the confidentiality and security " +"of\n" +"your password(s) and accounts(s). You are entirely responsible for all\n" +"activities that occur on or through your account(s).\n" +"

\n" +"\n" +"

\n" +"Users are prohibited from violating or attempting to violate the security " +"of\n" +"the Site, including, without limitation, (a) accessing data not intended " +"for\n" +"such user or logging into a server or account which the user is not " +"authorized\n" +"to access, (b) attempting to probe, scan or test the vulnerability of a " +"system\n" +"or network or to breach security or authentication measures without proper\n" +"authorization, (c) attempting to interfere with service to any user, host " +"or\n" +"network, including, without limitation, via means of submitting a virus to " +"the\n" +"Site, overloading, \"flooding,\" \"spamming,\" \"mailbombing\" or \"crashing," +"\" (d)\n" +"sending unsolicited e-mail, including promotions and/or advertising of " +"products\n" +"or services, or (e) forging any TCP/IP packet header or any part of the " +"header\n" +"information in any e-mail or newsgroup posting. Violations of system or " +"network\n" +"security may result in civil or criminal liability. You agree that it is " +"your\n" +"responsibility to install anti-virus software and related protections " +"against\n" +"viruses, Trojan horses, worms, time bombs, cancelbots or other computer\n" +"programming routines or engines that are intended to damage, destroy, " +"disrupt\n" +"or otherwise impair a computer’s functionality or operation.\n" +"\n" +"

\n" +"\n" +"

Creating Profiles and Posting Comments

\n" +"

\n" +"Accountholders can create user profiles by adding descriptions and/or " +"uploading\n" +"photos. They can also post comments to the prisoners’ letters. You alone " +"are\n" +"responsible for all content you add to the Site, including but not limited " +"to\n" +"the information and photos in your profile and the content in your posts. " +"You\n" +"agree not to post content that includes any defamatory, abusive, obscene,\n" +"threatening or illegal material, or any other material that infringes on " +"the\n" +"ability of others to enjoy the Site or that infringes on the rights of " +"others.\n" +"\n" +"En tant que simple fournisseur d’hébergement, Expression Carcérale ne sera " +"en\n" +"aucun cas responsable du contenu des blogs des Membres et des messages\n" +"que les Visiteurs pourront inscrire, quel que soit le support dudit\n" +"message, non plus que des contacts passés entre les Membres, les\n" +"Visiteurs et lesdits tiers, quels qu'ils soient.\n" +"\n" +"EC est un fournisseur d’hébergement. En aucun cas, EC ne peut être\n" +"assimilé à un éditeur ou un auteur relativement aux blogs des Membres.\n" +"\n" +"Contenus manifestement illicites :\n" +"\n" +"Le contenu publié par l’utilisateur ne doit pas inciter à la haine, à\n" +"la violence, à l'anorexie, à la fabrication et utilisation\n" +"d'explosifs, au suicide, au racisme, à l'antisémitisme, à la\n" +"xénophobie, à l’homophobie, faire l'apologie des crimes de guerre ou\n" +"des crimes contre l'humanité ;\n" +"\n" +"Le contenu publié par l'utilisateur ne doit présenter en aucun cas un\n" +"caractère pédophile ou pédo-pornographique.\n" +"\n" +"Le contenu publié par l’utilisateur ne doit pas inciter à commettre un\n" +"crime, un délit ou un acte de terrorisme ;\n" +"\n" +"Le contenu publié par l’utilisateur ne doit pas inciter à la\n" +"discrimination d'une personne ou d'un groupe de personne en raison de\n" +"son appartenance à une ethnie, à une religion, à une race, ou du fait\n" +"de son orientation sexuelle ou de son handicap.\n" +"\n" +"Dans le cadre de ses obligations de surveillance sur les contenus\n" +"manifestement illicites, édictées par la loi du 21 janvier 2004 pour\n" +"la confiance en l'économie numérique, l'association EC pourra\n" +"être amenée à consulter une copie des messages envoyé à l'éditeur d'un\n" +"blog via le formulaire de contact disponible sur le blog.\n" +"\n" +"\n" +"Contenus litigieux :\n" +"\n" +"L'utilisateur s'engage à prendre connaissance avant toute publication\n" +"des règles et limites relatives à la liberté d'expression. La liberté\n" +"d'expression autorise la critique, le rapport d'informations vérifiées\n" +"et prouvées, elle n'autorise pas le dénigrement et la\n" +"diffamation. Tout dénigrement, diffamation, ou allégation\n" +"d'informations inexactes ou volontairement tronquées pour en changer\n" +"le sens peuvent entrainer des poursuites à l'encontre de leur auteur.\n" +"\n" +"Le contenu publié par l’utilisateur ne doit pas porter atteinte aux\n" +"droits à la réputation, à la vie privée de tiers et à l'image ;\n" +"\n" +"Le contenu publié par l’utilisateur ne doit pas être, au strict sens\n" +"de la loi, dénigrant ou diffamatoire.\n" +"\n" +"La liberté d'expression autorise la critique dès lors qu'elle est\n" +"objective, argumentée, et portant sur des faits réels.\n" +"\n" +"\n" +"

\n" +"

\n" +"BtB cannot and does not review every profile or posting made on the Site. " +"You\n" +"should expect the Site to include information and opinions from a variety " +"of\n" +"individuals and organizations other than BtB. BtB does not endorse or\n" +"guarantee the accuracy of any posting, regardless of whether the posting " +"comes\n" +"from a prisoner, a web site user, a guest, or a member of our staff.\n" +"

\n" +"

\n" +"Although BtB cannot monitor all profiles and postings, BtB reserves the " +"right\n" +"(though not the obligation) to delete, move, or edit any profile content or\n" +"postings for any reason whatsoever.\n" +"\n" +"Malgré le fait que EC ne peux surveiller tout le contenu hebergé par\n" +"le site, EC se reserve le droit (et pas l'obligation) de supprimer,\n" +"déplacer, ou éditer tout contenu sur le site.\n" +"\n" +"alt: EC peut décider, à sa convenance, d'effacer ou de bloquer tout ou\n" +"partie du contenu d'un blog, notamment dans le cas où le membre ne\n" +"respecterait pas les présentes conditions. Dans ce cas, EC s'éfforcera\n" +"de présenter des explications au membre.\n" +"\n" +"Suite à la suppresison de contenu ou d'un compte, le Membre ne peux\n" +"demander à EC une quelconque indemnité.\n" +"\n" +"\n" +"\n" +"

\n" +"

Transcription

\n" +"

\n" +"An accountholder can prepare transcriptions of the prisoners’ posted " +"letters.\n" +"An accountholder can also edit an existing transcription in order to " +"correct\n" +"errors. You agree not to make changes to a transcription that is already\n" +"accurate.\n" +"

\n" +"\n" +"

\n" +"By transcribing a prisoner’s letter, you represent and warrant that you are\n" +"accurately transcribing the content of the prisoner’s letter. By making " +"edits\n" +"to a transcription, you represent and warrant that the edits are accurate. " +"BtB\n" +"does not endorse or guarantee the accuracy of any transcription.\n" +"

\n" +"\n" +"

\n" +"BtB reserves the right to lock transcription forms to prevent any further " +"edits\n" +"to a prisoner’s letter. BtB also reserves the right (though not the\n" +"obligation) to delete, move, or edit any transcriptions that BtB considers\n" +"unacceptable or inappropriate, whether for legal or other reasons.\n" +"

\n" +"\n" +"

Privacy

\n" +"

\n" +"BtB respects the privacy of our users. BtB’s Privacy Policy is expressly\n" +"incorporated herein by reference and made a part of the Terms. The Privacy\n" +"Policy is located at\n" +"%(base_url)s%(url_about_privacy)s.\n" +"

\n" +"

Termination of Account

\n" +"

\n" +"You may terminate your account via the link on your profile page.\n" +"

\n" +"\n" +"

\n" +"BtB reserves the right to terminate your account(s), to restrict your access " +"to\n" +"your account(s), and/or to delete any content posted through your account" +"(s),\n" +"with or without notice, for any or for no reason, and without any liability " +"to\n" +"you. The license granted to BtB by you in any and all content furnished by " +"you\n" +"to the Site is irrevocable and survives after termination of your account.\n" +"

\n" +"

\n" +"If you decide to terminate your account, you may opt to delete the comments " +"you\n" +"have posted to the Site. If you wish to delete your comments, you must do " +"so\n" +"at the time you terminate your account. Once your account is terminated, " +"you\n" +"will lose the ability to perform any authenticated functions on the Site,\n" +"including the ability to delete your comments.\n" +"

\n" +"\n" +"

\n" +"Un membre de EC peut demander la suppression de son compte ainsi que\n" +"des contenus hebergés sur la plate-forme.\n" +"\n" +"Téléchargement du contenu lors du départ d'un membre ? \n" +"\n" +"?? garder les URLs avec un message \"contenu suuprimé à la demande de " +"l'auteur\".\n" +"

\n" +"\n" +"

\n" +"

Prohibited Site Usage

\n" +"

\n" +"The Site and/or any portion of the Site may not be reproduced, duplicated,\n" +"copied, sold, resold, visited or otherwise exploited for any commercial " +"purpose\n" +"without our express written consent, except for such reproduction as occurs " +"in\n" +"the normal course of reading or viewing the Site using a Web browser. We do " +"not\n" +"permit any resale or commercial use of the Site or its contents; any " +"derivative\n" +"use of the Site or its contents; or any use of data mining, robots, or " +"similar\n" +"data gathering and extraction tools.\n" +"\n" +"Il est interdit de collecter ou stocker des données en vue de créer\n" +"une base de données concernant les Membres du Service, notamment leur\n" +"noms et prénoms; XXX - moteur de recherche ?\n" +"\n" +"\n" +"

\n" +"\n" +"EC s’engage à ne pas faire d’usage commercial des informations\n" +"personnelles concernant ses Membres.\n" +"\n" +"\n" +"

Parental Notice

\n" +"

Pursuant to 47 U.S.C. Section 230(d) as amended, BtB hereby notifies you\n" +"that parental control protections (such as computer hardware, software, or\n" +"filter services) are commercially available that may assist you in limiting\n" +"access to material that is harmful to minors. Information identifying " +"current\n" +"providers of such protection is available on the Internet (e.g.,\n" +"http://en.wikipedia.org/wiki/List_of_content-" +"control_software).\n" +"

\n" +"\n" +"

Intellectual Property

\n" +"

\n" +"By furnishing content to the Site, you grant BtB a non-exclusive, royalty-" +"free,\n" +"perpetual, and worldwide license to, among other things, copy, distribute,\n" +"transmit, publicly display, reproduce, edit, transcribe, translate, and\n" +"reformat the content you furnish, and/or to incorporate the content you " +"furnish\n" +"into a collective work. This license also allows BtB to, among other " +"things,\n" +"periodically print your comments and send the comments to prisoners. This\n" +"license is perpetual and applies even after a user’s account has been\n" +"terminated to content submitted by the user before termination of the " +"account.\n" +"Subject only to the rights granted to BtB under this license, you retain\n" +"ownership of the copyrights and all other rights in the content furnished " +"by\n" +"you.\n" +"

\n" +"

Representations and Warranties of Web Site User

\n" +"

\n" +"By submitting content to the Site, you represent and warrant, with respect " +"to\n" +"all content furnished by you, that you submit to BtB, as follows:\n" +"

\n" +"\n" +"
    \n" +"
  1. You are the sole author of all content, and all content is original to\n" +"you.
    2. \n" +"
  2. You have the right to submit the content to BtB and to grant BtB the " +"rights\n" +"set forth herein.
    3. \n" +"\n" +"Les Membres garantissent à EC qu'ils disposent des droits nécessaires\n" +"à la publication et / ou au partage des contenus qu'ils déposent sur\n" +"la plateforme du Service. Par droits, on entend les droits relevant du\n" +"Code de la propriété intellectuelle comme les droits d'auteur, de\n" +"reproduction, de diffusion, le droit des marques… sur tout support\n" +"existant ou à venir.\n" +"\n" +"\n" +"
  3. The content does not violate or constitute the infringement of any " +"patent,\n" +"copyright, trademark, trade secret, right of privacy, right of publicity, " +"moral\n" +"right, or other intellectual property right or other right of any person or\n" +"entity.
    4. \n" +"
  4. The content, your submission of the content to BtB, and the posting of " +"the\n" +"content online do not violate the rights of any person or entity or any " +"state\n" +"or federal law or regulation.
    5. \n" +"
  5. The content does not contain any threatening, harassing, libelous, " +"false,\n" +"defamatory, offensive, obscene, or pornographic material, or other material\n" +"that would violate any other applicable law or regulation.
    6. \n" +"
\n" +"\n" +"

\n" +"By submitting content to BtB, you acknowledge and agree that such content " +"may\n" +"be posted on the BtB website and made publicly available to anyone who " +"wishes\n" +"to view the content. You acknowledge and agree that BtB shall have no\n" +"responsibility, liability, or obligation to you with regard to the content\n" +"submitted, its protection, its use or misuse in any way whatsoever by any\n" +"entity, including but not limited to BtB itself. You acknowledge and agree\n" +"that BtB will in no event be liable for the editing, removal or disabling " +"of\n" +"access to any content under the Terms.\n" +"\n" +"\n" +"Le Membre reconnaît expressément que :\n" +"\n" +"- le contenu de son blog est sous sa seule responsabilité tant civile que " +"pénale en sa qualité d'auteur et d'éditeur du blog,\n" +"\n" +"- EC, en tant que fournisseur d’hébergement, n‘est en aucun cas responsable " +"des contenus que le Membre a publiés ou de toute autre information ou " +"communication du Membre (que ce soit des textes publiés, images, hyperliens " +"ou autre contenu),\n" +"\n" +"- EC n'assume vis à vis des contenus publiés par le Membre et les Visiteurs " +"aucune responsabilité quant à leur possible caractère menaçant, " +"anticonstitutionnel, vulgaire, raciste, pornographique, diffamatoire, " +"injurieux, offensant, criminel, dégradant ou violant le code de la propriété " +"intellectuelle et ou portant atteinte aux droits des marques.\n" +"\n" +"En tant qu’auteur et éditeur de son blog, le Membre s’engage à respecter sur " +"son blog les lois et règlements en vigueur en France.\n" +"\n" +"La plateforme EC permet en outre à toute personne de lui signaler\n" +"toutes données constituant une infraction par rapport aux lois et\n" +"règlements en vigueur, ainsi que contre les infractions à la loi du 29\n" +"juillet 1881 sur la liberté de la presse.\n" +"\n" +"Concernant les demandes de retrait ou de suppression de Blog, de\n" +"commentaires, de photos, la loi du 21 juin 2004 pour la confiance dans\n" +"l’économie numérique (LCEN) indique que les hébergeurs ne sont pas\n" +"responsables d'un contenu litigieux qu'ils hébergent dès lors qu'ils\n" +"n'a pas été porté régulièrement à leur connaissance le caractère\n" +"litigieux de ce contenu.\n" +"\n" +"Un tiers qui souhaite mettre fin à ce qu'il considère comme un\n" +"préjudice doit donc initialement prendre contact avec l'éditeur du\n" +"Site (par l'intermédiaire du formulaire contact présent en bas de\n" +"Blog), et s'il n'arrive pas à le contacter ou que l'éditeur du Blog\n" +"refuse de retirer le contenu notifié malgré une décision de justice\n" +"l'enjoignant à le faire, il devra justifier auprès de l'association EC\n" +"de cette impossibilité de contacter l'éditeur du Blog ou de faire\n" +"exécuter cette décision de justice.\n" +"\n" +"En tout état de cause, EC se réserve le droit de refuser de\n" +"donner suite à une notification abusive, c'est à dire une notification\n" +"qui n'ait pas été porté au préalable à la connaissance de l'éditeur du\n" +"Blog, ou une notification portant sur un contenu non manifestement\n" +"illicite.\n" +"\n" +"Dés que EC recevra la demande d’information émanant de la plainte d’un\n" +"utilisateur sur un Blog litigieux, de la part du Procureur de la\n" +"République, de la police ou de la gendarmerie ou de toute autre\n" +"autorité judiciaire, EC traitera dans les plus brefs délais cette\n" +"demande.\n" +"\n" +"

\n" +"\n" +"

?

\n" +"

\n" +" En conformité avec la loi du 6 janvier 1978 relative à\n" +" l'informatique, aux fichiers, aux libertés, le traitement\n" +" automatisé des données nominatives réalisé à partir du Site\n" +" Internet www.over-blog.com a fait l'objet d'une déclaration auprès\n" +" de la Commission Nationale de l'Informatique et des Libertés\n" +" (CNIL).\n" +"\n" +"

\n" +"\n" +"

Digital Millenium Copyright Act/Copyright Infringement and Notification " +"Policy

\n" +"

\n" +"We respect the intellectual property of others. If you believe that your\n" +"copyrighted materials have been copied in a way that constitutes copyright\n" +"infringement, please follow the procedure set forth in our Digital " +"Millennium\n" +"Copyright Act Notice Policy, which is located at\n" +"%(base_url)s%(url_about_dmca)s and is\n" +"expressly incorporated herein by reference and made a part of the Terms.\n" +"

\n" +"

Termination of Service

\n" +"

\n" +"BtB disclaims all responsibility and liability for the availability,\n" +"timeliness, security or reliability of BtB’s services or Site, or any " +"software\n" +"provided through the Site. BtB reserves the right to modify, suspend, or\n" +"discontinue the services or access to the Site without any notice at any " +"time\n" +"for any reason and without any liability to you.\n" +"\n" +"EC est un espace de libre-expression : aucune censure n'est pratiquée\n" +"sur les pages des éditeurs de Blogs, qui s'engagent en contrepartie à\n" +"respecter strictement les lois Françaises. Tout utilisateur peut\n" +"raconter, argumenter, critiquer ce qu'il désire, dès lors qu'il\n" +"respecte cette règle de base.\n" +"\n" +"

\n" +"

No Waiver of Terms

\n" +"

\n" +"Failure of BtB to exercise or enforce any right or provision of these Terms\n" +"shall not be deemed a waiver of such right or provision in that or any " +"other\n" +"instance.\n" +"

\n" +"

Indemnity

\n" +"

\n" +"You agree to indemnify and hold harmless BtB, its affiliates, subsidiaries,\n" +"officers and directors, agents, employees and partners, and any parties " +"with\n" +"whom BtB may contract to provide its services, from any third party claim " +"or\n" +"demand, including reasonable attorneys’ fees for damages and/or costs due to " +"or\n" +"arising out of your breach of your obligations under this the Terms.\n" +"

\n" +"\n" +"

Severability

\n" +"

\n" +"If any provision of the Terms shall be deemed unlawful, void, or for any " +"reason\n" +"unenforceable, then that provision shall be deemed severable from these " +"terms\n" +"and conditions and shall not affect the validity and enforceability of any\n" +"remaining provisions.\n" +"\n" +"Si une partie quelconque des CGU devait s'avérer illégale, invalide ou\n" +"inapplicable, le terme ou les termes en question seraient effacés des\n" +"CGU et les termes restants subsisteraient et garderaient leur pleine\n" +"force et leur plein effet et continueraient à être applicables.\n" +"\n" +"Ces CGU sont placées sous l'autorité de la législation Française. Tout\n" +"désaccord ou conflit qui ne se règle pas par la voie amiable relève de\n" +"la juridiction des tribunaux compétents.\n" +"

\n" +"\n" +"

Governing Law and Entire Agreement

\n" +"

These Terms are governed by the laws of the Commonwealth of " +"Massachusetts,\n" +"without regard to the rules of conflict of law that may cause the laws of\n" +"another jurisdiction to apply. You agree to the sole and exclusive " +"jurisdiction\n" +"and venue of the federal or state courts serving Massachusetts in the event " +"of\n" +"any dispute of any kind arising from or relating to the Site or Services, " +"or\n" +"your use or review of it. The Terms constitute the entire agreement " +"between\n" +"the parties with respect to the subject matter hereof and supersedes and\n" +"replaces all prior or contemporaneous understandings or agreements, written " +"or\n" +"oral, regarding such subject matter. If for any reason a court of competent\n" +"jurisdiction finds any provision or portion of these Terms to be " +"unenforceable,\n" +"the remainder of the Terms will continue in full force and effect.\n" +"

\n" +"\n" +"Identification de EC, hébergeur\n" +"\n" +"ExpressionCarcerale.fr\n" +"Association de 1901\n" +"Adresse : \n" +"XXXX\n" +"Publication au JO\n" +"Site déclaré à la CNIL ? \n" +"\n" +"Les serveurs des Sites sont hébergés en France par :\n" +"Online.fr Dedibox Illiane ? \n" +"\n" +"\n" +"

\n" +"Effective Date of the Agreement is 2010-11-15.\n" +"

\n" +msgstr "" + +#: templates/about/terms.html:13 +#, python-format +msgid "" +"\n" +"

General

\n" +"

\n" +"Welcome to Between the Bars (“BtB”). BtB is a blog platform for prisoners\n" +"who have no or limited access to broadcast media. Its mission is to " +"facilitate\n" +"communication between prisoners and the public through our website available " +"at\n" +"%(base_url)s (“the Site”).\n" +"

\n" +"\n" +"

\n" +"In order for BtB to operate this service effectively and responsibly, we " +"have\n" +"created ground rules for using the Site, which are set out in this document\n" +"(the “Terms”). By accessing, using, or contributing to the Site in any " +"way,\n" +"you agree to abide by the Terms. The Terms constitute a legally binding\n" +"Agreement between you and BtB. \n" +"

\n" +"\n" +"

\n" +"BtB may modify the Terms from time to time, at BtB’s discretion, and such\n" +"modifications shall be effective upon posting by BtB on the Site. Your\n" +"continued use of the Site after BtB posts revised Terms signifies your\n" +"acceptance of the revised Terms. It is therefore important that you review " +"the\n" +"Terms regularly to ensure you are updated as to any changes. \n" +"

\n" +"\n" +"

\n" +"We appreciate your understanding and are happy to answer any questions you " +"have\n" +"about these Terms. \n" +"

\n" +"\n" +"

\n" +"The following Terms apply to the Site and its services:\n" +"

\n" +"\n" +"

Disclaimer and Waiver of Certain Damages

\n" +"

\n" +"THE SITE AND CONTENT AND SERVICES OFFERED AT, THROUGH, OR IN CONNECTION " +"WITH\n" +"THE SITE ARE PROVIDED ON AN \"AS IS\" AND \"AS AVAILABLE\" BASIS WITHOUT " +"WARRANTIES\n" +"OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO " +"WARRANTIES\n" +"OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR\n" +"OTHERWISE. WITHOUT LIMITATION, WE DISCLAIM ANY AND ALL WARRANTIES REGARDING " +"THE\n" +"SECURITY, RELIABILITY, TIMELINESS AND PERFORMANCE OF THE SERVICES OFFERED. " +"WE\n" +"MAKE NO WARRANTY, EXPRESS OR IMPLIED, THAT THE BTB SITE, THE CONTENT ON THE\n" +"SITE, AND THE SERVICES WILL BE UNINTERRUPTED, TIMELY OR ERROR-FREE. SOME\n" +"JURISDICTIONS DO NOT ALLOW THE DISCLAIMER OF CERTAIN WARRANTIES, SO SOME OF " +"THE\n" +"ABOVE DISCLAIMER MAY NOT APPLY TO YOU.\n" +"

\n" +"

\n" +"TO THE EXTENT NOT PROHIBITED BY APPLICABLE LAW, IN NO EVENT SHALL BTB BE " +"LIABLE\n" +"FOR ANY DIRECT, INDIRECT, SPECIAL, OR CONSEQUENTIAL DAMAGES, REGARDLESS OF " +"THE\n" +"NATURE OF THE CLAIM OR THE FORM OF ACTION, ARISING FROM THE CONTENT ON THE\n" +"SITE, THE SERVICES, OR THE SITE, WHETHER OR NOT WE SHALL HAVE HAD ANY\n" +"KNOWLEDGE, ACTUAL OR CONSTRUCTIVE, THAT SUCH DAMAGES MIGHT BE INCURRED.\n" +"

\n" +"\n" +"

Eligibility

\n" +"

\n" +"You must be 18 years of age or older to use this Site. By using the Site, " +"you\n" +"represent and warrant that you are 18 years of age or older. \n" +"

\n" +"\n" +"

Account, Password and Security

\n" +"

\n" +"You may create an account with BtB by providing a username and password.\n" +"Creating an account will allow you to create a user profile and make\n" +"contributions to the Site, including but not limited to posting comments " +"and\n" +"participating in the transcription process. Through the transcription " +"process,\n" +"accountholders may transcribe posted letters from the prisoners, and/or " +"edit\n" +"existing transcriptions to correct errors. \n" +"

\n" +"\n" +"

\n" +"You are solely responsible for maintaining the confidentiality and security " +"of\n" +"your password(s) and accounts(s). You are entirely responsible for all\n" +"activities that occur on or through your account(s).\n" +"

\n" +"\n" +"

\n" +"Users are prohibited from violating or attempting to violate the security " +"of\n" +"the Site, including, without limitation, (a) accessing data not intended " +"for\n" +"such user or logging into a server or account which the user is not " +"authorized\n" +"to access, (b) attempting to probe, scan or test the vulnerability of a " +"system\n" +"or network or to breach security or authentication measures without proper\n" +"authorization, (c) attempting to interfere with service to any user, host " +"or\n" +"network, including, without limitation, via means of submitting a virus to " +"the\n" +"Site, overloading, \"flooding,\" \"spamming,\" \"mailbombing\" or \"crashing," +"\" (d)\n" +"sending unsolicited e-mail, including promotions and/or advertising of " +"products\n" +"or services, or (e) forging any TCP/IP packet header or any part of the " +"header\n" +"information in any e-mail or newsgroup posting. Violations of system or " +"network\n" +"security may result in civil or criminal liability. You agree that it is " +"your\n" +"responsibility to install anti-virus software and related protections " +"against\n" +"viruses, Trojan horses, worms, time bombs, cancelbots or other computer\n" +"programming routines or engines that are intended to damage, destroy, " +"disrupt\n" +"or otherwise impair a computer’s functionality or operation.\n" +"

\n" +"\n" +"

Creating Profiles and Posting Comments

\n" +"

\n" +"Accountholders can create user profiles by adding descriptions and/or " +"uploading\n" +"photos. They can also post comments to the prisoners’ letters. You alone " +"are\n" +"responsible for all content you add to the Site, including but not limited " +"to\n" +"the information and photos in your profile and the content in your posts. " +"You\n" +"agree not to post content that includes any defamatory, abusive, obscene,\n" +"threatening or illegal material, or any other material that infringes on " +"the\n" +"ability of others to enjoy the Site or that infringes on the rights of " +"others.\n" +"

\n" +"

\n" +"BtB cannot and does not review every profile or posting made on the Site. " +"You\n" +"should expect the Site to include information and opinions from a variety " +"of\n" +"individuals and organizations other than BtB. BtB does not endorse or\n" +"guarantee the accuracy of any posting, regardless of whether the posting " +"comes\n" +"from a prisoner, a web site user, a guest, or a member of our staff.\n" +"

\n" +"

\n" +"Although BtB cannot monitor all profiles and postings, BtB reserves the " +"right\n" +"(though not the obligation) to delete, move, or edit any profile content or\n" +"postings for any reason whatsoever.\n" +"

\n" +"

Transcription

\n" +"

\n" +"An accountholder can prepare transcriptions of the prisoners’ posted " +"letters.\n" +"An accountholder can also edit an existing transcription in order to " +"correct\n" +"errors. You agree not to make changes to a transcription that is already\n" +"accurate. \n" +"

\n" +"\n" +"

\n" +"By transcribing a prisoner’s letter, you represent and warrant that you are\n" +"accurately transcribing the content of the prisoner’s letter. By making " +"edits\n" +"to a transcription, you represent and warrant that the edits are accurate. " +"BtB\n" +"does not endorse or guarantee the accuracy of any transcription.\n" +"

\n" +"\n" +"

\n" +"BtB reserves the right to lock transcription forms to prevent any further " +"edits\n" +"to a prisoner’s letter. BtB also reserves the right (though not the\n" +"obligation) to delete, move, or edit any transcriptions that BtB considers\n" +"unacceptable or inappropriate, whether for legal or other reasons.\n" +"

\n" +"\n" +"

Privacy

\n" +"

\n" +"BtB respects the privacy of our users. BtB’s Privacy Policy is expressly\n" +"incorporated herein by reference and made a part of the Terms. The Privacy\n" +"Policy is located at \n" +"%(base_url)s%(url_about_privacy)s.\n" +"

\n" +"

Termination of Account

\n" +"

\n" +"You may terminate your account via the link on your profile page. \n" +"

\n" +"\n" +"

\n" +"BtB reserves the right to terminate your account(s), to restrict your access " +"to\n" +"your account(s), and/or to delete any content posted through your account" +"(s),\n" +"with or without notice, for any or for no reason, and without any liability " +"to\n" +"you. The license granted to BtB by you in any and all content furnished by " +"you\n" +"to the Site is irrevocable and survives after termination of your account.\n" +"

\n" +"

\n" +"If you decide to terminate your account, you may opt to delete the comments " +"you\n" +"have posted to the Site. If you wish to delete your comments, you must do " +"so\n" +"at the time you terminate your account. Once your account is terminated, " +"you\n" +"will lose the ability to perform any authenticated functions on the Site,\n" +"including the ability to delete your comments.\n" +"

\n" +"

\n" +"

Prohibited Site Usage

\n" +"

\n" +"The Site and/or any portion of the Site may not be reproduced, duplicated,\n" +"copied, sold, resold, visited or otherwise exploited for any commercial " +"purpose\n" +"without our express written consent, except for such reproduction as occurs " +"in\n" +"the normal course of reading or viewing the Site using a Web browser. We do " +"not\n" +"permit any resale or commercial use of the Site or its contents; any " +"derivative\n" +"use of the Site or its contents; or any use of data mining, robots, or " +"similar\n" +"data gathering and extraction tools.\n" +"

\n" +"\n" +"

Parental Notice

\n" +"

Pursuant to 47 U.S.C. Section 230(d) as amended, BtB hereby notifies you\n" +"that parental control protections (such as computer hardware, software, or\n" +"filter services) are commercially available that may assist you in limiting\n" +"access to material that is harmful to minors. Information identifying " +"current\n" +"providers of such protection is available on the Internet (e.g., \n" +"http://en.wikipedia.org/wiki/List_of_content-" +"control_software).\n" +"

\n" +"\n" +"

Intellectual Property

\n" +"

\n" +"By furnishing content to the Site, you grant BtB a non-exclusive, royalty-" +"free,\n" +"perpetual, and worldwide license to, among other things, copy, distribute,\n" +"transmit, publicly display, reproduce, edit, transcribe, translate, and\n" +"reformat the content you furnish, and/or to incorporate the content you " +"furnish\n" +"into a collective work. This license also allows BtB to, among other " +"things,\n" +"periodically print your comments and send the comments to prisoners. This\n" +"license is perpetual and applies even after a user’s account has been\n" +"terminated to content submitted by the user before termination of the " +"account.\n" +"Subject only to the rights granted to BtB under this license, you retain\n" +"ownership of the copyrights and all other rights in the content furnished " +"by\n" +"you.\n" +"

\n" +"

Representations and Warranties of Web Site User

\n" +"

\n" +"By submitting content to the Site, you represent and warrant, with respect " +"to\n" +"all content furnished by you, that you submit to BtB, as follows:\n" +"

\n" +"\n" +"
    \n" +"
  1. You are the sole author of all content, and all content is original to\n" +"you.
    2. \n" +"
  2. You have the right to submit the content to BtB and to grant BtB the " +"rights\n" +"set forth herein.
    3. \n" +"
  3. The content does not violate or constitute the infringement of any " +"patent,\n" +"copyright, trademark, trade secret, right of privacy, right of publicity, " +"moral\n" +"right, or other intellectual property right or other right of any person or\n" +"entity.
    4. \n" +"
  4. The content, your submission of the content to BtB, and the posting of " +"the\n" +"content online do not violate the rights of any person or entity or any " +"state\n" +"or federal law or regulation.
    5. \n" +"
  5. The content does not contain any threatening, harassing, libelous, " +"false,\n" +"defamatory, offensive, obscene, or pornographic material, or other material\n" +"that would violate any other applicable law or regulation.
    6. \n" +"
\n" +"\n" +"

\n" +"By submitting content to BtB, you acknowledge and agree that such content " +"may\n" +"be posted on the BtB website and made publicly available to anyone who " +"wishes\n" +"to view the content. You acknowledge and agree that BtB shall have no\n" +"responsibility, liability, or obligation to you with regard to the content\n" +"submitted, its protection, its use or misuse in any way whatsoever by any\n" +"entity, including but not limited to BtB itself. You acknowledge and agree\n" +"that BtB will in no event be liable for the editing, removal or disabling " +"of\n" +"access to any content under the Terms.\n" +"

\n" +"\n" +"

Digital Millenium Copyright Act/Copyright Infringement and Notification " +"Policy

\n" +"

\n" +"We respect the intellectual property of others. If you believe that your\n" +"copyrighted materials have been copied in a way that constitutes copyright\n" +"infringement, please follow the procedure set forth in our Digital " +"Millennium\n" +"Copyright Act Notice Policy, which is located at \n" +"%(base_url)s%(url_about_dmca)s and is\n" +"expressly incorporated herein by reference and made a part of the Terms.\n" +"

\n" +"

Termination of Service

\n" +"

\n" +"BtB disclaims all responsibility and liability for the availability,\n" +"timeliness, security or reliability of BtB’s services or Site, or any " +"software\n" +"provided through the Site. BtB reserves the right to modify, suspend, or\n" +"discontinue the services or access to the Site without any notice at any " +"time\n" +"for any reason and without any liability to you.\n" +"

\n" +"

No Waiver of Terms

\n" +"

\n" +"Failure of BtB to exercise or enforce any right or provision of these Terms\n" +"shall not be deemed a waiver of such right or provision in that or any " +"other\n" +"instance.\n" +"

\n" +"

Indemnity

\n" +"

\n" +"You agree to indemnify and hold harmless BtB, its affiliates, subsidiaries,\n" +"officers and directors, agents, employees and partners, and any parties " +"with\n" +"whom BtB may contract to provide its services, from any third party claim " +"or\n" +"demand, including reasonable attorneys’ fees for damages and/or costs due to " +"or\n" +"arising out of your breach of your obligations under this the Terms. \n" +"

\n" +" \n" +"

Severability

\n" +"

\n" +"If any provision of the Terms shall be deemed unlawful, void, or for any " +"reason\n" +"unenforceable, then that provision shall be deemed severable from these " +"terms\n" +"and conditions and shall not affect the validity and enforceability of any\n" +"remaining provisions.\n" +"

\n" +"\n" +"

Governing Law and Entire Agreement

\n" +"

These Terms are governed by the laws of the Commonwealth of " +"Massachusetts,\n" +"without regard to the rules of conflict of law that may cause the laws of\n" +"another jurisdiction to apply. You agree to the sole and exclusive " +"jurisdiction\n" +"and venue of the federal or state courts serving Massachusetts in the event " +"of\n" +"any dispute of any kind arising from or relating to the Site or Services, " +"or\n" +"your use or review of it. The Terms constitute the entire agreement " +"between\n" +"the parties with respect to the subject matter hereof and supersedes and\n" +"replaces all prior or contemporaneous understandings or agreements, written " +"or\n" +"oral, regarding such subject matter. If for any reason a court of competent\n" +"jurisdiction finds any provision or portion of these Terms to be " +"unenforceable,\n" +"the remainder of the Terms will continue in full force and effect.\n" +"

\n" +"\n" +"

\n" +"Effective Date of the Agreement is 2010-11-15.\n" +"

\n" +msgstr "" + +#: templates/blogs/_blog_cloud.html:6 msgid "Categories" msgstr "" -#: templates/blogs/_blog_cloud.html:9 templates/blogs/_blog_cloud.html:47 +#: templates/blogs/_blog_cloud.html:10 templates/blogs/_blog_cloud.html:48 #: templates/blogs/all_posts_list.html:2 msgid "Recent posts" msgstr "" -#: templates/blogs/_blog_cloud.html:13 +#: templates/blogs/_blog_cloud.html:14 +#: templates/correspondence/base_letter_list.html:138 +#: templates/correspondence/show_commentmailing.html:37 +#: templates/moderation/stats.html:77 +#: templates/profiles/profile_detail.html:81 msgid "Comments" msgstr "" -#: templates/blogs/_blog_cloud.html:17 +#: templates/blogs/_blog_cloud.html:18 msgid "Authors" msgstr "" -#: templates/blogs/_blog_cloud.html:20 +#: templates/blogs/_blog_cloud.html:21 msgid "Every Page" msgstr "" -#: templates/blogs/_blog_cloud.html:26 +#: templates/blogs/_blog_cloud.html:27 msgid "Posts by category" msgstr "" -#: templates/blogs/_blog_cloud.html:55 +#: templates/blogs/_blog_cloud.html:56 msgid "All posts by date" msgstr "" -#: templates/blogs/_blog_cloud.html:64 +#: templates/blogs/_blog_cloud.html:65 #: templates/blogs/_post_bottom_line.html:22 -#: templates/blogs/_sharing_buttons.html:2 -#: templates/blogs/all_comments_list.html:15 -#: templates/blogs/author_post_list.html:4 -#: templates/blogs/author_post_list.html:12 +#: templates/blogs/_sharing_buttons.html:3 +#: templates/blogs/all_comments_list.html:7 +#: templates/blogs/author_post_list.html:3 +#: templates/blogs/author_post_list.html:14 #: templates/blogs/post_detail.html:30 +#: templates/notification/notice_settings.html:49 +#: templates/subscriptions/subscribe_to.html:11 msgid "by" msgstr "" -#: templates/blogs/_blog_cloud.html:67 +#: templates/blogs/_blog_cloud.html:68 msgid "All comments" msgstr "" -#: templates/blogs/_blog_cloud.html:72 +#: templates/blogs/_blog_cloud.html:73 msgid "Authors with recent posts" msgstr "" -#: templates/blogs/_blog_cloud.html:78 +#: templates/blogs/_blog_cloud.html:79 templates/profiles/groups_list.html:87 msgid "profile" msgstr "" -#: templates/blogs/_blog_cloud.html:83 +#: templates/blogs/_blog_cloud.html:84 #: templates/profiles/profiles_list.html:10 msgid "All authors" msgstr "" @@ -352,6 +1669,7 @@ msgstr "" #: templates/blogs/_post_bottom_line.html:20 #: templates/blogs/post_detail.html:28 +#: templates/correspondence/delete_letter_confirm.html:15 msgid "From" msgstr "" @@ -384,27 +1702,27 @@ msgstr "" msgid "Original (PDF)" msgstr "" -#: templates/blogs/_post_tag_list.html:3 -msgid "filed under" -msgstr "" - #: templates/blogs/_post_title_line.html:23 msgid "Flag post" msgstr "" #: templates/blogs/_post_title_line.html:30 +#: templates/profiles/profile_detail.html:27 msgid "Click to read the transcription" msgstr "" #: templates/blogs/_post_title_line.html:31 +#: templates/profiles/profile_detail.html:28 msgid "Transcribed" msgstr "" #: templates/blogs/_post_title_line.html:36 +#: templates/profiles/profile_detail.html:32 msgid "Partially transcribed" msgstr "" #: templates/blogs/_post_title_line.html:43 +#: templates/profiles/profile_detail.html:39 msgid "Add transcription" msgstr "" @@ -419,43 +1737,40 @@ msgid "Tags" msgstr "" #: templates/blogs/_post_title_line.html:73 +#: templates/moderation/_common.html:24 templates/moderation/_scans.html:114 #: templates/scanning/transcription_edit.html:117 msgid "Save" msgstr "" -#: templates/blogs/_related.html:29 -msgid "More" -msgstr "" - -#: templates/blogs/_sharing_buttons.html:1 +#: templates/blogs/_sharing_buttons.html:2 msgid "Share this" msgstr "" -#: templates/blogs/_sharing_buttons.html:2 +#: templates/blogs/_sharing_buttons.html:3 msgid "at" msgstr "" -#: templates/blogs/_sharing_buttons.html:2 +#: templates/blogs/_sharing_buttons.html:3 msgid "Share on twitter" msgstr "" -#: templates/blogs/_sharing_buttons.html:2 +#: templates/blogs/_sharing_buttons.html:3 msgid "Share on facebook" msgstr "" -#: templates/blogs/_sharing_buttons.html:2 +#: templates/blogs/_sharing_buttons.html:3 msgid "Share on Pinterest" msgstr "" -#: templates/blogs/all_comments_list.html:8 +#: templates/blogs/all_comments_list.html:5 msgid "Recent Comments" msgstr "" -#: templates/blogs/all_comments_list.html:15 +#: templates/blogs/all_comments_list.html:6 msgid "Posted on" msgstr "" -#: templates/blogs/all_comments_list.html:32 +#: templates/blogs/all_comments_list.html:8 msgid "More comments" msgstr "" @@ -471,10 +1786,6 @@ msgstr "" msgid "Compose" msgstr "" -#: templates/blogs/base_post_list.html:23 -msgid "More posts" -msgstr "" - #: templates/blogs/blogs_front_page.html:3 msgid "Blogs from writers in prison" msgstr "" @@ -500,6 +1811,8 @@ msgid "Delete post" msgstr "" #: templates/blogs/delete_post.html:16 +#: templates/comments/delete_comment.html:11 +#: templates/moderation/_notes.html:26 #: templates/scanning/transcription_edit.html:118 msgid "Cancel" msgstr "" @@ -538,10 +1851,14 @@ msgid "Title" msgstr "" #: templates/blogs/manage_posts.html:13 +#: templates/moderation/manage_tasks.html:44 msgid "Status" msgstr "" #: templates/blogs/manage_posts.html:14 +#: templates/moderation/manage_tasks.html:43 +#: templates/notification/notices.html:16 +#: templates/scanning/revision_list.html:28 msgid "Date" msgstr "" @@ -550,10 +1867,12 @@ msgid "Draft" msgstr "" #: templates/blogs/manage_posts.html:27 +#: templates/moderation/_dashboard.html:18 templates/moderation/stats.html:38 msgid "Ready to publish" msgstr "" #: templates/blogs/manage_posts.html:30 +#: templates/moderation/_dashboard.html:19 templates/moderation/stats.html:37 msgid "Published" msgstr "" @@ -577,29 +1896,29 @@ msgstr "" msgid "By the page" msgstr "" -#: templates/blogs/page_picker.html:45 +#: templates/blogs/page_picker.html:46 msgid "" "This page requires javsacript. To browse Between the Bars without " "javascript, try" msgstr "" -#: templates/blogs/page_picker.html:45 +#: templates/blogs/page_picker.html:46 msgid "blogs" msgstr "" -#: templates/blogs/page_picker.html:47 +#: templates/blogs/page_picker.html:48 msgid "Every page" msgstr "" -#: templates/blogs/page_picker.html:50 +#: templates/blogs/page_picker.html:51 msgid "Loading..." msgstr "" -#: templates/blogs/page_picker.html:53 +#: templates/blogs/page_picker.html:54 msgid "That's all so far" msgstr "" -#: templates/blogs/page_picker.html:54 +#: templates/blogs/page_picker.html:55 msgid "help us grow" msgstr "" @@ -613,17 +1932,20 @@ msgid "This post is in reply to comments on" msgstr "" #: templates/blogs/post_detail.html:75 -#: templates/profiles/profile_detail.html:44 +#: templates/profiles/profile_detail.html:56 +#: templates/profiles/profile_edit.html:43 msgid "Transcription" msgstr "" -#: templates/blogs/post_detail.html:79 -#: templates/profiles/profile_detail.html:48 +#: templates/blogs/post_detail.html:79 templates/comments/_comment.html:35 +#: templates/notification/notice_settings.html:10 +#: templates/profiles/profile_detail.html:60 +#: templates/profiles/profile_edit.html:44 msgid "edit" msgstr "" #: templates/blogs/post_detail.html:80 -#: templates/profiles/profile_detail.html:49 +#: templates/profiles/profile_detail.html:61 #: templates/scanning/revision_list.html:5 msgid "revisions" msgstr "" @@ -636,44 +1958,121 @@ msgstr "" msgid "Replies feed" msgstr "" -#: templates/blogs/tag_post_list.html:4 templates/blogs/tag_post_list.html:11 +#: templates/blogs/tag_post_list.html:3 +#: templates/notification/notice_settings.html:56 msgid "Posts tagged" msgstr "" -#: templates/blogs/tag_post_list.html:6 templates/blogs/tag_post_list.html:13 +#: templates/blogs/tag_post_list.html:4 msgid "Uncategorized posts" msgstr "" -#: templates/comments/_comment_form.html:19 +#: templates/comments/_comment.html:34 templates/comments/edit_comment.html:2 +#: templates/comments/edit_comment.html:4 +msgid "Edit comment" +msgstr "" + +#: templates/comments/_comment.html:39 +msgid "Delete comment" +msgstr "" + +#: templates/comments/_comment.html:40 templates/notification/notices.html:27 +msgid "delete" +msgstr "" + +#: templates/comments/_comment.html:46 +msgid "Flag comment" +msgstr "" + +#: templates/comments/_comment.html:55 +msgid "scanned reply" +msgstr "" + +#: templates/comments/_comment.html:56 +msgid "view as blog post" +msgstr "" + +#: templates/comments/_comment_form.html:6 +msgid "" +"\n" +"\t We will print and mail your reply by .\n" +"\t " +msgstr "" + +#: templates/comments/_comment_form.html:10 +msgid "Guidelines" +msgstr "" + +#: templates/comments/_comment_form.html:21 msgid "Send Reply »" msgstr "" -#: templates/comments/preview.html:4 templates/comments/preview.html.py:13 +#: templates/comments/delete_comment.html:4 +#: templates/comments/delete_comment.html:10 +msgid "Delete reply" +msgstr "" + +#: templates/comments/delete_comment.html:5 +msgid "Are you sure you want to delete this reply? There is no undo." +msgstr "" + +#: templates/comments/edit_comment.html:6 +#, python-format +msgid "" +"\n" +" Please consider our guidelines while " +"writing.\n" +" " +msgstr "" + +#: templates/comments/edit_comment.html:17 +msgid "Save changes" +msgstr "" + +#: templates/comments/preview.html:4 templates/comments/preview.html.py:17 msgid "Preview your comment" msgstr "" -#: templates/comments/preview.html:11 -msgid "Please correct the error below" -msgid_plural "Please correct the errors below" +#: templates/comments/preview.html:12 +msgid "" +"\n" +" Please correct the error below" +msgid_plural "" +"Please correct the errors below\n" +" " msgstr[0] "" msgstr[1] "" -#: templates/comments/preview.html:28 +#: templates/comments/preview.html:32 msgid "and" msgstr "" -#: templates/comments/preview.html:28 +#: templates/comments/preview.html:34 msgid "Post your comment" msgstr "" -#: templates/comments/preview.html:28 +#: templates/comments/preview.html:35 msgid "or make changes" msgstr "" -#: templates/comments/preview.html:44 +#: templates/comments/preview.html:52 msgid "Preview" msgstr "" +#: templates/correspondence/base.html:9 +msgid "Pending" +msgstr "" + +#: templates/correspondence/base.html:12 +#: templates/correspondence/base_letter_list.html:48 +msgid "Sent" +msgstr "" + +#: templates/correspondence/base.html:15 +msgid "Write a letter" +msgstr "" + #: templates/correspondence/base_letter_list.html:7 #: templates/correspondence/pending.html:3 msgid "Manage correspondence" @@ -683,23 +2082,881 @@ msgstr "" msgid "Changed letter sent status." msgstr "" -#: templates/correspondence/sent.html:4 templates/correspondence/sent.html:8 +#: templates/correspondence/base_letter_list.html:47 +msgid "Recipient" +msgstr "" + +#: templates/correspondence/base_letter_list.html:49 +msgid "Letters" +msgstr "" + +#: templates/correspondence/base_letter_list.html:50 +msgid "Date created" +msgstr "" + +#: templates/correspondence/base_letter_list.html:51 +msgid "Sender" +msgstr "" + +#: templates/correspondence/base_letter_list.html:64 +msgid "Address missing" +msgstr "" + +#: templates/correspondence/base_letter_list.html:66 +msgid "Add one?" +msgstr "" + +#: templates/correspondence/base_letter_list.html:88 +msgid "Consent form: joined" +msgstr "" + +#: templates/correspondence/base_letter_list.html:97 +msgid "Signup complete" +msgstr "" + +#: templates/correspondence/base_letter_list.html:107 +msgid "First post" +msgstr "" + +#: templates/correspondence/base_letter_list.html:118 +msgid "Letter" +msgstr "" + +#: templates/correspondence/base_letter_list.html:134 +msgid "Build comment mailing (PDF)" +msgstr "" + +#: templates/correspondence/base_letter_list.html:159 +msgid "Remove" +msgstr "" + +#: templates/correspondence/base_letter_list.html:173 +msgid "Show waitlist postcard" +msgstr "" + +#: templates/correspondence/base_letter_list.html:175 +msgid "Waitlist" +msgstr "" + +#: templates/correspondence/delete_letter_confirm.html:2 +msgid "Confirm delete letter" +msgstr "" + +#: templates/correspondence/delete_letter_confirm.html:6 +msgid "Are you sure you want to delete this letter?" +msgstr "" + +#: templates/correspondence/delete_letter_confirm.html:8 +msgid "Delete letter" +msgstr "" + +#: templates/correspondence/delete_letter_confirm.html:10 +#: templates/moderation/_common.html:25 +#: templates/profiles/profile_edit.html:31 +msgid "cancel" +msgstr "" + +#: templates/correspondence/delete_letter_confirm.html:14 +msgid "To" +msgstr "" + +#: templates/correspondence/mass_mailing_spreadsheet.html:2 +msgid "Mass mailing spreadsheet" +msgstr "" + +#: templates/correspondence/mass_mailing_spreadsheet.html:4 +msgid "Mass Mailing Spreadsheet" +msgstr "" + +#: templates/correspondence/mass_mailing_spreadsheet.html:6 +msgid "Spreadsheets for users in the following organizations:" +msgstr "" + +#: templates/correspondence/mass_mailing_spreadsheet.html:10 +msgid "All users in" +msgstr "" + +#: templates/correspondence/mass_mailing_spreadsheet.html:16 +msgid "In prison" +msgstr "" + +#: templates/correspondence/mass_mailing_spreadsheet.html:18 +msgid "In the system, with returned license agreement or without." +msgstr "" + +#: templates/correspondence/mass_mailing_spreadsheet.html:22 +msgid "Invitable" +msgstr "" + +#: templates/correspondence/mass_mailing_spreadsheet.html:24 +msgid "" +"On the waitlist or not yet waitlisted -- we could send them an invitation." +msgstr "" + +#: templates/correspondence/mass_mailing_spreadsheet.html:28 +msgid "Waitlistable" +msgstr "" + +#: templates/correspondence/mass_mailing_spreadsheet.html:30 +msgid "" +"We have their name, but we haven't invited them, nor have we sent a waitlist " +"postcard." +msgstr "" + +#: templates/correspondence/mass_mailing_spreadsheet.html:34 +msgid "Waitlisted" +msgstr "" + +#: templates/correspondence/mass_mailing_spreadsheet.html:36 +msgid "" +"We have sent them a waitlist postcard, and we haven't sent an invitation." +msgstr "" + +#: templates/correspondence/mass_mailing_spreadsheet.html:40 +msgid "Invited users in" +msgstr "" + +#: templates/correspondence/mass_mailing_spreadsheet.html:47 +msgid "Invited" +msgstr "" + +#: templates/correspondence/mass_mailing_spreadsheet.html:49 +msgid "" +"An invitation has been sent, but license agreement has not been returned." +msgstr "" + +#: templates/correspondence/mass_mailing_spreadsheet.html:53 +msgid "Enrolled" +msgstr "" + +#: templates/correspondence/mass_mailing_spreadsheet.html:55 +msgid "In prison, have returned a license agreement." +msgstr "" + +#: templates/correspondence/mass_mailing_spreadsheet.html:59 +msgid "Bloggers with published content" +msgstr "" + +#: templates/correspondence/mass_mailing_spreadsheet.html:61 +msgid "Have a post or profile published." +msgstr "" + +#: templates/correspondence/pending.html:6 +msgid "Pending correspondence" +msgstr "" + +#: templates/correspondence/pending.html:9 +msgid "Update pending correspondence" +msgstr "" + +#: templates/correspondence/pending.html:11 +msgid "Refreshes all 'automatic' pending correspondence." +msgstr "" + +#: templates/correspondence/pending.html:15 +msgid "Waitlist consent requests" +msgstr "" + +#: templates/correspondence/pending.html:17 +msgid "" +"\n" +" Generates \"waitlist\" postcards for all consent requests that haven't " +"received them.\n" +" " +msgstr "" + +#: templates/correspondence/pending.html:25 +msgid "Collated mailings:" +msgstr "" + +#: templates/correspondence/pending.html:28 +msgid "Include consent envelopes?" +msgstr "" + +#: templates/correspondence/pending.html:32 +msgid "Before date" +msgstr "" + +#: templates/correspondence/pending.html:42 +msgid "Include waitlist postcards?" +msgstr "" + +#: templates/correspondence/pending.html:48 +msgid "" +"\n" +"\t\tInclude \"signup complete\" letters?\n" +"\t\t" +msgstr "" + +#: templates/correspondence/pending.html:56 +msgid "Include first posts?" +msgstr "" + +#: templates/correspondence/pending.html:62 +msgid "Include comments?" +msgstr "" + +#: templates/correspondence/pending.html:68 +msgid "Include personal letters?" +msgstr "" + +#: templates/correspondence/pending.html:76 +msgid "Build collated mailing" +msgstr "" + +#: templates/correspondence/pending.html:82 +msgid "Mailings:" +msgstr "" + +#: templates/correspondence/sent.html:4 templates/correspondence/sent.html:8 msgid "Sent correspondence" msgstr "" +#: templates/correspondence/show_commentmailing.html:10 +#, python-format +msgid "" +"\n" +" Recent comments left for %(recipient_profile)s\n" +" " +msgstr "" + +#: templates/correspondence/show_commentmailing.html:19 +msgid "Excerpt" +msgstr "" + +#: templates/correspondence/show_commentmailing.html:22 +msgid "Reply ID" +msgstr "" + +#: templates/correspondence/show_commentmailing.html:26 +msgid "" +"\n" +"\t\t To reply to these comments, please print the\n" +"\t\t following “reply ID” at the top of\n" +"\t\t the page: {{\n" +"\t\t post.reply_code.code }}. This will allow us\n" +"\t\t to notify the comment authors that you have\n" +"\t\t written a response. Please only include one\n" +"\t\t reply ID at a time – to reply to more than\n" +"\t\t one set of comments, use a separate page.\n" +"\t\t " +msgstr "" + +#: templates/feeds/_all.html:1 +msgid "All posts" +msgstr "" + +#: templates/feeds/_author.html:1 templates/feeds/_subscriptions.html:6 +#: templates/notification/notice_settings.html:53 +msgid "Posts by" +msgstr "" + +#: templates/feeds/_comments.html:1 templates/feeds/_subscriptions.html:8 +msgid "Comments on" +msgstr "" + +#: templates/feeds/_org.html:1 +msgid "Recent posts from" +msgstr "" + +#: templates/feeds/_subscriptions.html:3 +msgid "Subscribe" +msgstr "" + +#: templates/feeds/_subscriptions.html:4 +msgid "Get notifications when new letters or replies are posted!" +msgstr "" + +#: templates/feeds/_subscriptions.html:7 +#: templates/notification/notice_settings.html:59 +msgid "Posts from" +msgstr "" + +#: templates/feeds/_subscriptions.html:9 +msgid "Posts tagged with" +msgstr "" + +#: templates/feeds/_subscriptions.html:19 +#: templates/feeds/_subscriptions.html:32 +#: templates/feeds/_subscriptions.html:47 +#: templates/feeds/_subscriptions.html:61 +#: templates/feeds/_subscriptions.html:74 +msgid "email me" +msgstr "" + +#: templates/feeds/_subscriptions.html:80 +#, python-format +msgid "" +"\n" +"\t\tAll %(site_name)s posts:\n" +"\t\t" +msgstr "" + +#: templates/feeds/_tag.html:1 +msgid "posts" +msgstr "" + +#: templates/moderation/_dashboard.html:4 +msgid "backend" +msgstr "" + +#: templates/moderation/_dashboard.html:8 +msgid "Unfinished" +msgstr "" + +#: templates/moderation/_dashboard.html:9 +msgid "Finished" +msgstr "" + +#: templates/moderation/_dashboard.html:11 +msgid "Scans" +msgstr "" + +#: templates/moderation/_dashboard.html:17 +msgid "Needs attention" +msgstr "" + +#: templates/moderation/_dashboard.html:21 +msgid "Documents" +msgstr "" + +#: templates/moderation/_dashboard.html:27 +msgid "Open Tickets" +msgstr "" + +#: templates/moderation/_dashboard.html:33 +msgid "Outgoing Mail" +msgstr "" + +#: templates/moderation/_dashboard.html:43 +msgid "Enqueued" +msgstr "" + +#: templates/moderation/_dashboard.html:44 +msgid "Needed" +msgstr "" + +#: templates/moderation/_notes.html:4 +msgid "Add Note" +msgstr "" + +#: templates/moderation/_notes.html:22 +msgid "Needs further attention?" +msgstr "" + +#: templates/moderation/_notes.html:29 +msgid "Add Note/Ticket" +msgstr "" + +#: templates/moderation/_notes.html:36 +msgid "NEEDS ATTENTION" +msgstr "" + +#: templates/moderation/_notes.html:48 +msgid "Assigned to" +msgstr "" + +#: templates/moderation/_notes.html:57 +msgid "Edit note" +msgstr "" + +#: templates/moderation/_notes.html:58 +msgid "Delete note" +msgstr "" + +#: templates/moderation/_notes.html:60 +msgid "Mark resolved" +msgstr "" + +#: templates/moderation/_scans.html:4 +msgid "Scans needing attention" +msgstr "" + +#: templates/moderation/_scans.html:7 +msgid "Documents needing attention" +msgstr "" + +#: templates/moderation/_scans.html:14 templates/moderation/_scans.html:49 +msgid "Delete scan" +msgstr "" + +#: templates/moderation/_scans.html:18 +msgid "started editing" +msgstr "" + +#: templates/moderation/_scans.html:38 +msgid "Warning" +msgstr "" + +#: templates/moderation/_scans.html:38 +msgid "" +"started editing this scan <%= btb.englishDateInterval(created, now) %> ago. " +"You might hold up a bit so that your changes don't conflict." +msgstr "" + +#: templates/moderation/_scans.html:44 +msgid "Split Scan" +msgstr "" + +#: templates/moderation/_scans.html:45 +msgid "Original (pdf)" +msgstr "" + +#: templates/moderation/_scans.html:52 +msgid "Replace scan" +msgstr "" + +#: templates/moderation/_scans.html:55 +msgid "Re-parse scan" +msgstr "" + +#: templates/moderation/_scans.html:58 +msgid "Merge scans" +msgstr "" + +#: templates/moderation/_scans.html:88 +msgid "Code" +msgstr "" + +#: templates/moderation/_scans.html:89 +msgid "Scan Code" +msgstr "" + +#: templates/moderation/_scans.html:95 +msgid "Author" +msgstr "" + +#: templates/moderation/_scans.html:111 +msgid "Post" +msgstr "" + +#: templates/moderation/_scans.html:111 +msgid "Photo" +msgstr "" + +#: templates/moderation/_scans.html:114 +msgid "Edit documents" +msgstr "" + +#: templates/moderation/base.html:2 +msgid "active" +msgstr "" + +#: templates/moderation/manage_tasks.html:2 +msgid "Manage tasks" +msgstr "" + +#: templates/moderation/manage_tasks.html:35 +msgid "Tasks" +msgstr "" + +#: templates/moderation/manage_tasks.html:38 +msgid "Restrict to" +msgstr "" + +#: templates/moderation/manage_tasks.html:38 +msgid "PENDING" +msgstr "" + +#: templates/moderation/manage_tasks.html:38 +msgid "SUCCESS" +msgstr "" + +#: templates/moderation/manage_tasks.html:38 +msgid "FAILURE" +msgstr "" + +#: templates/moderation/manage_tasks.html:42 +msgid "Link" +msgstr "" + +#: templates/moderation/manage_tasks.html:45 +msgid "Result" +msgstr "" + +#: templates/moderation/manage_tasks.html:46 +#: templates/moderation/manage_tasks.html:58 +msgid "Traceback" +msgstr "" + +#: templates/moderation/manage_tasks.html:50 +msgid "waiting page for task" +msgstr "" + +#: templates/moderation/manage_tasks.html:50 +msgid "link" +msgstr "" + +#: templates/moderation/stats.html:7 +msgid "Stats" +msgstr "" + +#: templates/moderation/stats.html:10 +msgid "Users" +msgstr "" + +#: templates/moderation/stats.html:12 +msgid "Current breakdown" +msgstr "" + +#: templates/moderation/stats.html:20 +msgid "New users per week" +msgstr "" + +#: templates/moderation/stats.html:30 templates/moderation/stats.html.py:40 +msgid "Posts" +msgstr "" + +#: templates/moderation/stats.html:32 templates/moderation/stats.html.py:78 +msgid "Totals" +msgstr "" + +#: templates/moderation/stats.html:36 +msgid "Total" +msgstr "" + +#: templates/moderation/stats.html:45 +msgid "Profiles" +msgstr "" + +#: templates/moderation/stats.html:53 +msgid "Timeline (by week)" +msgstr "" + +#: templates/moderation/stats.html:61 +msgid "Impact: Posts" +msgstr "" + +#: templates/moderation/stats.html:68 +msgid "Impact: Pages" +msgstr "" + +#: templates/moderation/stats.html:80 +msgid "Comments published" +msgstr "" + +#: templates/moderation/stats.html:82 +msgid "Comments posted per week" +msgstr "" + +#: templates/moderation/stats.html:85 +msgid "This graph shows the number of new comments posted per week." +msgstr "" + +#: templates/moderation/stats.html:88 +msgid "Commenter Impact" +msgstr "" + +#: templates/notification/notice_settings.html:3 +msgid "Notification preferences" +msgstr "" + +#: templates/notification/notice_settings.html:8 +msgid "Communication preferences" +msgstr "" + +#: templates/notification/notice_settings.html:10 +msgid "Your email address" +msgstr "" + +#: templates/notification/notice_settings.html:13 +msgid "" +"You have no email address in your profile, so will receive no email " +"notifications." +msgstr "" + +#: templates/notification/notice_settings.html:14 +msgid "Add an email address" +msgstr "" + +#: templates/notification/notice_settings.html:16 +msgid "Send email notifications for:" +msgstr "" + +#: templates/notification/notice_settings.html:29 +#: templates/notification/notice_settings.html:64 +msgid "Save preferences" +msgstr "" + +#: templates/notification/notice_settings.html:31 +#, python-format +msgid "" +"\n" +"\t To ensure our emails are not delivered to your spam folder, please add " +"%(from_email)s to your address " +"book.\n" +"\t " +msgstr "" + +#: templates/notification/notice_settings.html:36 +msgid "Subscriptions" +msgstr "" + +#: templates/notification/notice_settings.html:37 +msgid "" +"Notifications appear on the site, and according to the preferences above." +msgstr "" + +#: templates/notification/notice_settings.html:47 +msgid "Replies to" +msgstr "" + +#: templates/notification/notice_settings.html:59 +#: templates/subscriptions/subscribe_to.html:12 +msgid "authors" +msgstr "" + +#: templates/notification/notice_settings.html:67 +msgid "You have no subscriptions." +msgstr "" + +#: templates/notification/notices.html:4 +#: templates/notification/notices.html:11 +msgid "Notifications" +msgstr "" + +#: templates/notification/notices.html:10 +msgid "Subscriptions and communication preferences" +msgstr "" + +#: templates/notification/notices.html:13 +msgid "Mark all as read" +msgstr "" + +#: templates/notification/notices.html:17 +msgid "Message" +msgstr "" + +#: templates/notification/notices.html:36 +msgid "Delete all messages" +msgstr "" + +#: templates/notification/notices.html:39 +msgid "No notifications." +msgstr "" + +#: templates/notification/new_post/notice.html:1 +#: templates/notification/new_reply/notice.html:1 +msgid "from" +msgstr "" + +#: templates/notification/new_reply/notice.html:1 +msgid "to a post you're following" +msgstr "" + +#: templates/profiles/confirm_delete_scan.html:2 +#: templates/profiles/profile_edit.html:37 +msgid "Remove scan" +msgstr "" + +#: templates/profiles/confirm_delete_scan.html:4 +msgid "Are you sure you want to remove your profile scan?" +msgstr "" + +#: templates/profiles/confirm_delete_scan.html:6 +msgid "Delete" +msgstr "" + +#: templates/profiles/confirm_delete_self.html:2 +#: templates/profiles/profile_edit.html:48 +msgid "Delete account" +msgstr "" + +#: templates/profiles/confirm_delete_self.html:4 +msgid "Delete account permanently?" +msgstr "" + +#: templates/profiles/confirm_delete_self.html:6 +msgid "" +"\n" +"Are you sure you want to delete your account? This cannot be undone. You " +"will\n" +"no longer be able to log in and all information about your profile will be\n" +"removed.\n" +msgstr "" + +#: templates/profiles/confirm_delete_self.html:19 +msgid "Delete comments" +msgstr "" + +#: templates/profiles/confirm_delete_self.html:22 +msgid "" +"\n" +" Note: Once things are on the Internet, it's nearly impossible for " +"them\n" +" to be removed completely. Search engines and other sites may " +"retain\n" +" copies of the comments, and they may have been printed and mailed " +"to\n" +" the authors of blog posts. However, we will make a good faith " +"effort\n" +" to remove your information.\n" +"\t" +msgstr "" + +#: templates/profiles/confirm_delete_self.html:31 +msgid "" +"\n" +" Once you delete your account, you will be unable to later delete\n" +" comments if you don't delete them now. Either way, your profile\n" +" information will no longer be associated with the comments.\n" +"\t" +msgstr "" + +#: templates/profiles/confirm_delete_self.html:38 +msgid "" +"\n" +" If you have any questions or concerns about this, please contact\n" +" info@betweenthebars.org.\n" +"\t" +msgstr "" + +#: templates/profiles/confirm_delete_self.html:45 +msgid "Delete account permanently" +msgstr "" + +#: templates/profiles/groups_list.html:15 +msgid "Partners" +msgstr "" + +#: templates/profiles/groups_list.html:31 +#, python-format +msgid "" +"\n" +"\t\t %(site.name)s partners program\n" +"\t\t" +msgstr "" + +#: templates/profiles/groups_list.html:36 +#, python-format +msgid "" +"\n" +"\t\tDo you know someone in prison who would like to blog? %(site.name)s\n" +"\t\tis growing through the support of volunteers around the world\n" +"\t\twho help to facilitate blogging. All you need to get started is\n" +"\t\taccess to a scanner so that you can scan letters you receive, and\n" +"\t\tto be willing to make a commitment to the people you'll be\n" +"\t\trepresenting.\n" +"\t\t" +msgstr "" + +#: templates/profiles/groups_list.html:47 +#, python-format +msgid "" +"\n" +"\t\tFor organizations with multiple writers, %(site.name)s can set\n" +"\t\tup a partner page to draw traffic and attention to your writers,\n" +"\t\tand represent your organization and its mission.\n" +"\t\t" +msgstr "" + +#: templates/profiles/groups_list.html:55 +msgid "" +"\n" +"\t\tIf you are an individual or organization that is interested in\n" +"\t\tmaking a commitment to help people in prison express themselves,\n" +"\t\tplease contact us at info@betweenthebars.org.\n" +"\t\t" +msgstr "" + +#: templates/profiles/groups_list.html:68 +#, python-format +msgid "" +"\n" +"\t\t Independent writers, supported by volunteers and staff for " +"%(site.name)s:\n" +"\t\t " +msgstr "" + +#: templates/profiles/groups_list.html:79 +#, python-format +msgid "" +"\n" +"\t\t\t %(profile.authored_posts_count)s posts;\n" +"\t\t\t latest %(profile.latest_post|naturalday)s.\n" +"\t\t\t " +msgstr "" + +#: templates/profiles/groups_list.html:94 +#, python-format +msgid "" +"\n" +"\t\t All %(chosen_org.name)s posts\n" +"\t\t " +msgstr "" + #: templates/profiles/profile_detail.html:6 +#: templates/profiles/profile_detail.html:12 #, python-format msgid "%(profile)s's profile" msgstr "" -#: templates/profiles/profile_detail.html:39 +#: templates/profiles/profile_detail.html:19 +msgid "Edit settings" +msgstr "" + +#: templates/profiles/profile_detail.html:51 msgid "Scanned profile" msgstr "" -#: templates/profiles/profile_edit.html:23 +#: templates/profiles/profile_detail.html:73 +#, python-format +msgid "" +"\n" +"\t Read more from %(profile)s's blog\n" +"\t " +msgstr "" + +#: templates/profiles/profile_detail.html:86 +msgid "No comments" +msgstr "" + +#: templates/profiles/profile_detail.html:89 +msgid "Transcriptions" +msgstr "" + +#: templates/profiles/profile_detail.html:94 +msgid "No transcriptions" +msgstr "" + +#: templates/profiles/profile_edit.html:6 +#, python-format +msgid "" +"\n" +" Edit profile for %(profile.display_name)s\n" +" " +msgstr "" + +#: templates/profiles/profile_edit.html:14 +#, python-format +msgid "" +"\n" +" Profile for %(profile.user.profile.display_name)s\n" +" " +msgstr "" + +#: templates/profiles/profile_edit.html:19 +msgid "Change password" +msgstr "" + +#: templates/profiles/profile_edit.html:20 +msgid "Email subscriptions" +msgstr "" + +#: templates/profiles/profile_edit.html:31 msgid "Save details" msgstr "" +#: templates/profiles/profile_edit.html:36 +msgid "Current profile page" +msgstr "" + +#: templates/profiles/profile_edit.html:39 +msgid "Profile for" +msgstr "" + #: templates/registration/activation_complete.html:7 msgid "Your registration is now complete." msgstr "" @@ -725,15 +2982,7 @@ msgstr "" msgid "Register" msgstr "" -#: templates/registration/password_change_form.html:7 -#, python-format -msgid "" -"\n" -"

%%{ trans \"For security purposes, enter your old password first.\" %%}\n" -msgstr "" - -#: templates/registration/password_change_form.html:14 +#: templates/registration/password_change_form.html:12 msgid "Change Password" msgstr "" @@ -823,15 +3072,6 @@ msgstr "" msgid "Registration temporarily closed" msgstr "" -#: templates/registration/registration_closed.html:6 -#, python-format -msgid "" -"\n" -"%%{ trans \"Registration is temporarily disabled while the site is " -"undergoing maintenance.\" %%}\n" -"%%{ trans \"We apologize for the inconvenience.\" %%}\n" -msgstr "" - #: templates/registration/registration_complete.html:6 msgid "Confirmation email sent" msgstr "" @@ -877,10 +3117,115 @@ msgid "" "for comments and transcriptions.\n" msgstr "" +#: templates/scanning/_column_diff.html:5 +#: templates/scanning/_column_diff.html:7 +#: templates/scanning/revision_list.html:25 +msgid "Revision" +msgstr "" + +#: templates/scanning/after_transcribe_comment.html:3 +msgid "Leave a note" +msgstr "" + +#: templates/scanning/after_transcribe_comment.html:12 +msgid "No thanks, skip this" +msgstr "" + +#: templates/scanning/delete.html:4 +msgid "Really delete scan?" +msgstr "" + +#: templates/scanning/delete.html:5 +msgid "" +"Are you sure you want to delete this scan? The following documents and any " +"comments they have will also be deleted." +msgstr "" + +#: templates/scanning/delete.html:7 +msgid "Delete (no undo)" +msgstr "" + +#: templates/scanning/delete.html:11 +msgid "pages" +msgstr "" + +#: templates/scanning/delete.html:11 +msgid "comments" +msgstr "" + +#: templates/scanning/delete.html:14 +msgid "Scan pages" +msgstr "" + +#: templates/scanning/flag.html:4 +msgid "Flag content" +msgstr "" + +#: templates/scanning/flag.html:5 +msgid "" +"A flag lets moderators now that something is not right about a particular " +"post, profile, or comment. Please help us by flagging any posts that seem " +"to be against our guidelines, or have " +"been improperly edited (for example, pages not rotated correctly)." +msgstr "" + +#: templates/scanning/flag.html:12 +msgid "Notify moderators" +msgstr "" + +#: templates/scanning/merge.html:5 +msgid "Merge Scan" +msgstr "" + +#: templates/scanning/merge.html:6 +msgid "" +"Choose a PDF file to merge (add to the bottom of) this scan's PDF. Use this " +"if, for example, someone adds an additional page to a profile." +msgstr "" + +#: templates/scanning/reimport.html:4 templates/scanning/reimport.html.py:7 +msgid "Reimport scan" +msgstr "" + +#: templates/scanning/reimport.html:5 +msgid "" +"If processing of a scan failed for whatever reason, sometimes reimporting it " +"will fix garbled or missing images. This will make any documents associated " +"with this scan unavailable until the import is finished." +msgstr "" + +#: templates/scanning/replace.html:3 templates/scanning/upload.html:4 +msgid "Upload scans" +msgstr "" + +#: templates/scanning/replace.html:5 +msgid "Replace Scan" +msgstr "" + +#: templates/scanning/replace.html:6 +msgid "Choose a PDF file to replace this scan's with." +msgstr "" + #: templates/scanning/revision_list.html:10 msgid "Transcription revisions" msgstr "" +#: templates/scanning/revision_list.html:13 +msgid "edit transcription" +msgstr "" + +#: templates/scanning/revision_list.html:26 +msgid "Compare" +msgstr "" + +#: templates/scanning/revision_list.html:27 +msgid "Editor" +msgstr "" + +#: templates/scanning/revision_list.html:56 +msgid "No transcription yet. Add one!" +msgstr "" + #: templates/scanning/transcription_edit.html:85 msgid "Transcription editor" msgstr "" @@ -900,3 +3245,54 @@ msgstr "" #: templates/scanning/transcription_edit.html:103 msgid "Transcription:" msgstr "" + +#: templates/scanning/upload.html:7 +msgid "Upload Scans" +msgstr "" + +#: templates/scanning/upload.html:8 +msgid "Upload individual PDF files, or zip files containing multiple PDFs." +msgstr "" + +#: templates/subscriptions/subscribe_to.html:3 +#: templates/subscriptions/subscribe_to.html:7 +msgid "Add subscription" +msgstr "" + +#: templates/subscriptions/subscribe_to.html:8 +msgid "Add a subscription to" +msgstr "" + +#: templates/subscriptions/subscribe_to.html:9 +msgid "posts tagged" +msgstr "" + +#: templates/subscriptions/subscribe_to.html:10 +msgid "posts by" +msgstr "" + +#: templates/subscriptions/subscribe_to.html:11 +msgid "comments on" +msgstr "" + +#: templates/subscriptions/subscribe_to.html:12 +msgid "posts from" +msgstr "" + +#: templates/subscriptions/subscribe_to.html:13 +msgid "Sign me up!" +msgstr "" + +#: templates/subscriptions/subscribe_to.html:14 +msgid "Subscription settings" +msgstr "" + +#: templates/subscriptions/subscribe_to.html:18 +#, python-format +msgid "" +"\n" +"Note: you have no email address set in your profile, so you will only see " +"notifications by logging into the site. If you'd like to receive email " +"notifications, please add an " +"email address in your profile.\n" +msgstr "" diff --git a/scanblog/locale/fr/LC_MESSAGES/django.po b/scanblog/locale/fr/LC_MESSAGES/django.po index 39efe0e..af1fcca 100644 --- a/scanblog/locale/fr/LC_MESSAGES/django.po +++ b/scanblog/locale/fr/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: django-btb VERSION\n" -"Report-Msgid-Bugs-To: arthur.lutz@gmail.com \n" -"POT-Creation-Date: 2012-05-31 15:42+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-08-06 07:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Arthur Lutz \n" "Language-Team: LANGUAGE \n" @@ -48,7 +48,7 @@ msgstr "Commentaire" msgid "Comments on '%s'" msgstr "Commentaires à propos '%s'" -#: btb/models.py:21 +#: btb/models.py:21 templates/notification/new_reply/notice.html:1 msgid "New reply" msgstr "Nouvelle réponse" @@ -56,7 +56,7 @@ msgstr "Nouvelle réponse" msgid "new reply to a post you're following" msgstr "nouvelle réponse à un article que vous suivez" -#: btb/models.py:25 +#: btb/models.py:25 templates/notification/new_post/notice.html:1 msgid "New post" msgstr "Nouvel article" @@ -71,13 +71,17 @@ msgstr "Répondre" #: comments/forms.py:23 msgid "" "If you enter anything in this field your comment will be treated as spam" -msgstr "Si vous entrez quelquechose dans ce champ, votre commentaire sera considéré comme du spam" +msgstr "" +"Si vous entrez quelquechose dans ce champ, votre commentaire sera considéré " +"comme du spam" #: comments/views.py:74 msgid "" "A moderator will review that comment shortly. Thanks for helping us run a " "tight ship." -msgstr "Un modérateur va faire une revue de votre commentaire bientôt. Merci de nous aider." +msgstr "" +"Un modérateur va faire une revue de votre commentaire bientôt. Merci de nous " +"aider." #: profiles/forms.py:9 msgid "* E-mail address" @@ -85,7 +89,8 @@ msgstr "Adresse e-mail" #: profiles/forms.py:10 msgid "Required. We never share or make e-mail addresses public." -msgstr "Obligatoire. Nous ne partageons jamais les addresses mails de notre site." +msgstr "" +"Obligatoire. Nous ne partageons jamais les addresses mails de notre site." #: profiles/forms.py:18 msgid "E-mail address" @@ -101,7 +106,9 @@ msgstr "Obligatoire." #: profiles/models.py:165 msgid "Show posts and comments that have been marked as adult?" -msgstr "Montre les articles et commentaires qui ont été noté comme du contenu adulte ?" +msgstr "" +"Montre les articles et commentaires qui ont été noté comme du contenu " +"adulte ?" #: profiles/views.py:235 msgid "Changes saved." @@ -117,13 +124,16 @@ msgstr "Vérifier si la retranscription est complète" #: scanning/views.py:633 msgid "Thanks for your attention to detail. Transcription updated." -msgstr "Merci pour votre attention au détail. La transcription a été mise à jour." +msgstr "" +"Merci pour votre attention au détail. La transcription a été mise à jour." #: scanning/views.py:736 msgid "" "A moderator will review that post shortly. Thanks for helping us run a tight " "ship." -msgstr "Un modérateur va faire une revue de votre article sous peu. Merci pour votre aide." +msgstr "" +"Un modérateur va faire une revue de votre article sous peu. Merci pour votre " +"aide." #: templates/404.html:3 msgid "404 - Not found" @@ -143,23 +153,23 @@ msgid "" "org'>http://betweenthebars.org." msgstr "Vous pouvez retournez sur la page d'acceuil ici : " -#: templates/_pagination.html:2 +#: templates/_pagination.html:3 msgid "Page:" msgstr "Page:" -#: templates/_pagination.html:4 +#: templates/_pagination.html:5 msgid "Previous page" msgstr "Page précédente" -#: templates/_pagination.html:4 +#: templates/_pagination.html:5 msgid "Previous" msgstr "Précédente" -#: templates/_pagination.html:10 +#: templates/_pagination.html:11 msgid "Next page" msgstr "Page suivante" -#: templates/_pagination.html:10 +#: templates/_pagination.html:11 msgid "Next" msgstr "Suivante" @@ -175,39 +185,57 @@ msgstr "Acceuil" msgid "Human stories from prison" msgstr "Des histoires humaines en prison" -#: templates/home.html:25 +#: templates/home.html:19 +#, fuzzy, python-format +msgid "" +"is a weblog platform for people in prison, through which the 1% of Americans " +"who are in prison can tell their stories. Leave a comment – we'll pass " +"it on." +msgstr "" +"est une plateforme de blogs pour personnes incarcérées. Laissez leur un " +"message, nous leur envoyons par courrier postal." + +#: templates/home.html:24 msgid "Gives voice to the voiceless." msgstr "Donne une voix aux sans voix" -#: templates/home.html:29 +#: templates/home.html:28 msgid "... encourages inmates to retain their individual identities ..." msgstr "... encourage les détenus à garder leur identité ..." -#: templates/home.html:33 +#: templates/home.html:32 msgid "Amazing stuff." msgstr "Incroyable!" -#: templates/home.html:63 templates/blogs/_blog_cloud.html:60 +#: templates/home.html:38 templates/feeds/_featured.html:1 +#: templates/feeds/_subscriptions.html:66 +#, fuzzy +msgid "Featured posts" +msgstr "Articles sans catégorie" + +#: templates/home.html:62 templates/blogs/_blog_cloud.html:61 msgid "Recent comments" msgstr "Commentaires récents" -#: templates/home.html:66 +#: templates/home.html:65 templates/moderation/_scans.html:20 +#: templates/scanning/_column_diff.html:5 +#: templates/scanning/_column_diff.html:7 msgid "ago" msgstr "il y a" -#: templates/home.html:68 +#: templates/home.html:67 templates/moderation/_notes.html:50 msgid "By" msgstr "Par" -#: templates/home.html:68 templates/blogs/_blog_cloud.html:64 +#: templates/home.html:67 templates/blogs/_blog_cloud.html:65 msgid "on" msgstr "le" -#: templates/home.html:76 +#: templates/home.html:75 msgid "Join the conversation!" msgstr "Rejoignez la conversation!" -#: templates/home.html:77 +#: templates/home.html:76 msgid "Head on over to the blogs." msgstr "Visitez les blogs" @@ -227,7 +255,8 @@ msgstr "À propos" msgid "Moderation" msgstr "Modération" -#: templates/site_base.html:45 +#: templates/site_base.html:45 templates/scanning/merge.html:9 +#: templates/scanning/replace.html:9 templates/scanning/upload.html:11 msgid "Upload" msgstr "Envoi de fichiers" @@ -251,7 +280,7 @@ msgstr "Se connecter" msgid "or" msgstr "ou" -#: templates/site_base.html:86 +#: templates/site_base.html:86 templates/profiles/groups_list.html:24 msgid "Join" msgstr "S'inscrire" @@ -263,7 +292,8 @@ msgstr "Nous contacter" msgid "Copyrights" msgstr "Droits d'auteur" -#: templates/site_base.html:124 templates/about/terms.html:4 +#: templates/site_base.html:124 templates/about/terms.fr.html:4 +#: templates/about/terms.html:4 msgid "Terms of Use" msgstr "Conditions d'usage" @@ -280,69 +310,1375 @@ msgid "Community Guidelines" msgstr "Guide de la communauté" #: templates/about/about_base.html:11 templates/about/faq.html:4 +#: templates/about/faq.html.py:7 msgid "Frequently Asked Questions" msgstr "Foire Aux Questions" +#: templates/about/about_base.html:12 +msgid "News" +msgstr "" + #: templates/about/about_base.html:13 msgid "Mailing list" msgstr "Liste de discussion" +#: templates/about/faq.html:8 +#, fuzzy, python-format +msgid "" +"\n" +" Please also see the\n" +" community guidelines\n" +" for commenting and transcribing posts.\n" +" " +msgstr "" +"\n" +"Si vous n'avez pas encore lu le guide de " +"la communauté qui explique la démarche pour les commentaires et les " +"retranscriptions.\n" + +#: templates/about/faq.html:15 +msgid "Who is behind this?" +msgstr "" + +#: templates/about/faq.html:17 +msgid "" +"\n" +" Between the Bars was founded by Charlie DeTar and Benjamin Mako Hill. " +"It is operated by Charlie DeTar and volunteers and staff in the Center for Civic Media at MIT.\n" +"\t" +msgstr "" + +#: templates/about/faq.html:21 +msgid "Why blogging?" +msgstr "" + +#: templates/about/get_involved.html:2 +msgid "Get involved" +msgstr "" + +#: templates/about/get_involved.html:4 +msgid "comment ... volunteer ... process mail ..." +msgstr "" + +#: templates/about/index.html:16 +#, python-format +msgid "" +"\n" +"\tUS Correctional Populations\n" +"\t
\n" +"\t

\n" +"\t Source:\n" +"\t \n" +"\t Citizenship, Democracy, and the Civic Reintegration of Criminal " +"Offenders\n" +"\t \n" +"\t
\n" +"\t
\n" +"\tWhen Prisoners Come Home\n" +"\t
\n" +"\t
\n" +"\t Source:\n" +"\t \n" +"\t When prisoners come home: parole and prisoner reentry\n" +"\t \n" +"\t by Joan Petersilia\n" +"\t
\n" +"\t
\n" +" " +msgstr "" + +#: templates/about/index.html:41 +#, python-format +msgid "" +"\n" +" About %(site.name)s\n" +" " +msgstr "" + +#: templates/about/index.html:46 +#, python-format +msgid "" +"\n" +" %(site.name)s is a weblog platform for people in\n" +" prison, through which the 1%% of America which is behind bars can tell " +"their\n" +" stories. Since people in prison are routinely denied access to the\n" +" Internet, we enable them to blog by scanning letters. We aim to provide " +"a\n" +" positive outlet for creativity, a tool to assist in the maintenance of\n" +" social safety nets, an opportunity to forge connections between people\n" +" inside and outside of prison, and a means to promote non-criminal\n" +" identities and personal expression. We hope to improve prisoner's " +"lives,\n" +" and help to reduce recidivism.\n" +" " +msgstr "" + +#: templates/about/index.html:59 +#, fuzzy +msgid "Leave comments" +msgstr "Commentaires récents" + +#: templates/about/index.html:61 +#, python-format +msgid "" +"\n" +"\tRegistered users can comment on blog posts. We periodically mail\n" +"\tcomment feeds back to the authors so they can hear from their fans and\n" +"\tcontinue the discussion.\n" +"\tSign up and\n" +"\tlog in today!\n" +" " +msgstr "" + +#: templates/about/index.html:69 +#, fuzzy +msgid "Transcribe posts" +msgstr "Retranscris" + +#: templates/about/index.html:71 +#, python-format +msgid "" +"\n" +"\t%(site.name)s relies on visitors to transcribe its bloggers' posts.\n" +"\tYou can help us out by\n" +"\tsigning up and\n" +"\tlogging in,\n" +"\tand starting to transcribe posts that interest you. Transcriptions\n" +"\tmake the blogs more accessible to search engines, translators and\n" +"\tvisitors.\n" +" " +msgstr "" + +#: templates/about/index.html:85 +#, python-format +msgid "" +"\n" +"\tCenter for Civic Media\n" +" " +msgstr "" + +#: templates/about/index.html:90 +#, python-format +msgid "" +"\n" +" %(site.name)s is supported by generous sponsorship from the\n" +" Center for Civic Media at MIT.\n" +" " +msgstr "" + +#: templates/about/privacy.html:8 +msgid "" +"\n" +" Between the Bars Privacy Policy\n" +" " +msgstr "" + +#: templates/about/privacy.html:14 +msgid "" +"\n" +" PLEASE REVIEW BEFORE USING THIS WEBSITE – IF YOU DO NOT AGREE WITH ALL " +"OF\n" +" THE TERMS OF THE BTB PRIVACY POLICY, DO NOT USE THIS WEBSITE.\n" +" " +msgstr "" + +#: templates/about/privacy.html:20 +#, python-format +msgid "" +"\n" +"

\n" +"The following discloses the information gathering and dissemination\n" +"practices for the Between the Bars (“BtB”) website available at\n" +"http://betweenthebars.org (the “Site”).\n" +"Your use of the Site constitutes your agreement to this privacy policy\n" +"and consent to the terms herein.\n" +"

\n" +"\n" +"

\n" +"BtB reserves the right to modify the information contained herein from time " +"to\n" +"time, with or without notice, so please check it regularly for any changes " +"or\n" +"updates. Your continued use of the Site after BtB has posted a modified\n" +"version of its privacy policy signifies your acceptance of the revised " +"privacy\n" +"policy.\n" +"

\n" +"\n" +"

Information We Collect and How We Use It

\n" +"
\n" +"
Normal Browsing
\n" +"

When you browse the Site, BtB collects data, including but\n" +"not limited to the public source IP address of the request, the domain name " +"and\n" +"host from which the user accessed the Internet (e.g., aol.com), the user’s\n" +"browser software and operating system, the date and time the user accesses " +"the\n" +"Site, web pages previously visited by the user, the web site to which the " +"user\n" +"links after visiting our Site, and user queries submitted to the Site. \n" +"

\n" +"

\n" +"We use this information to generate statistics and measure Site activity, " +"which\n" +"helps us better understand our visitors and make the Site more useful to " +"them. \n" +"

\n" +"
\n" +"\n" +"
Information You Provide
\n" +"

In order to make any edits to the Site, including flagging offensive\n" +"content, accessing offensive content, writing or editing transcriptions,\n" +"posting comments to letters, and/or creating a user profile you will need " +"to\n" +"register and create an account by providing an email address, username, and\n" +"password. If you create an account, you may, but you are not required to\n" +"create a user profile by uploading a photo of yourself and/or providing a\n" +"description of yourself. If you create an account, BtB collects and stores " +"the\n" +"email address, username, and password that you provide as well as any\n" +"information you voluntarily provide in your profile. BtB also collects and\n" +"stores information tied to all public content provided by users and user\n" +"activity on the Site.

\n" +"\n" +"
BtB’s Disclosure of Your Information
\n" +"

Available log records, account information, and all data stored on " +"our\n" +"servers may be accessed by our system administrators. BtB may need to " +"disclose\n" +"this information to law enforcement or other government officials for your\n" +"protection or in connection with an investigation of fraud, intellectual\n" +"property infringement, or other activity that is illegal or may expose us " +"or\n" +"our users to legal liability, and as otherwise deemed reasonably necessary " +"by\n" +"BtB.\n" +"

\n" +"

BtB also may provide aggregated, de-identified data or reports on user " +"demographics and behavior to interested third parties, including but not " +"limited to journals and academics.\n" +"

\n" +"

\n" +"Additionally, making edits to the Site is a public action, and all content " +"may\n" +"be publicly visible. Identification of all contributed content may " +"include,\n" +"but is not limited to display of your username and any other information or\n" +"pictures that you provide in your profile. All content may be retained for\n" +"restorative, archival, or research purposes by BtB. All unsolicited\n" +"information shall be deemed to be non-confidential and BtB shall be free to\n" +"reproduce, use, disclose, and distribute such unsolicited information to " +"others\n" +"without limitation or attribution. Permissible distribution of your " +"content\n" +"includes but is not limited to the sending of your comments by BtB to\n" +"prisoners.\n" +"

\n" +"
\n" +"

Control of Your Password

\n" +"\n" +"

\n" +"You may not disclose your BtB password to any third parties nor share it " +"with\n" +"any third parties. If your password has been compromised for any reason, " +"you\n" +"should immediately change your password.\n" +"

\n" +"\n" +"

Modification of Privacy Policy

\n" +"

\n" +"BtB reserves the right to revise this privacy policy from time to time, with " +"or\n" +"without notice, so please check it regularly for any changes or updates. " +"Your\n" +"continued use of the Site after BtB has posted a modified version of its\n" +"privacy policy signifies your acceptance of the revised privacy policy.\n" +"

\n" +"\n" +"

Contacting BtB

\n" +"

\n" +"If you have any questions regarding this privacy policy, you can contact us " +"by\n" +"emailing info@betweenthebars.org.\n" +"

\n" +"\n" +"

\n" +"Effective Date of the Agreement is 2010-11-15.\n" +"

\n" +msgstr "" + #: templates/about/resources.html:4 msgid "Resources" msgstr "" -#: templates/blogs/_blog_cloud.html:5 +#: templates/about/terms.fr.html:7 templates/about/terms.html:7 +msgid "Between the Bars Terms of Use" +msgstr "" + +#: templates/about/terms.fr.html:9 templates/about/terms.html:9 +msgid "" +"\n" +" PLEASE REVIEW BEFORE USING THIS WEBSITE – IF YOU DO NOT AGREE TO " +"THESE TERMS OF USE, DO NOT USE THIS WEBSITE.\n" +msgstr "" + +#: templates/about/terms.fr.html:13 +#, python-format +msgid "" +"\n" +"

General

\n" +"

\n" +"Le site Expression Carcerale (\"EC\") est une plateforme de blog pour\n" +"les personnes incarcérées qui n'ont pas ou un accès limité aux médias\n" +"de publication. La mission du site est de faciliter la communication\n" +"entre les prisonniers et le public à travers le site disponible à\n" +"l'adresse suivante : %(base_url)s (\"le site\").\n" +"

\n" +"\n" +"

\n" +"Pour permettre à EC d'opérer ce service de manière effective et\n" +"responsable, nous avons écrit des règles de bon fonctionnement à\n" +"destination des utilisateurs du site. En consultant, utilisant et\n" +"contribuant à ce site par quelqueconque moyen, vous agréez à ces\n" +"règles de bon fonctionnement. Ces termes lient juridiquement\n" +"l'utilisateur et les opérateurs du site EC.\n" +"

\n" +"\n" +"

\n" +"XXX suppr ? ou au moins notification aux utilisateurs inscrits.\n" +"FIXME s/Membre/Usager/\n" +"\n" +"Les règles énoncées ici peuvent être modifiées avec le temps. Nous\n" +"nous efforcerons de communiquer les nouveaux termes aux utilisateurs\n" +"inscrits. Pour les utilisateurs non-inscrits, ceux-ci devront\n" +"consulter régulièrement ces termes pour prendre connaissance des\n" +"nouvelles versions.\n" +"\n" +"BtB may modify the Terms from time to time, at BtB’s discretion, and such\n" +"modifications shall be effective upon posting by BtB on the Site. Your\n" +"continued use of the Site after BtB posts revised Terms signifies your\n" +"acceptance of the revised Terms. It is therefore important that you review " +"the\n" +"Terms regularly to ensure you are updated as to any changes.\n" +"

\n" +"\n" +"

\n" +"Merci de votre compréhension et nous nous tenons à votre disposition\n" +"pour toute question relative à ces conditions d'utilisation.\n" +"

\n" +"\n" +"

\n" +"Les Conditions d'Utilisation du Site et ces services :\n" +"

\n" +"\n" +"

Disclaimer and Waiver of Certain Damages

\n" +"

\n" +"THE SITE AND CONTENT AND SERVICES OFFERED AT, THROUGH, OR IN CONNECTION " +"WITH\n" +"THE SITE ARE PROVIDED ON AN \"AS IS\" AND \"AS AVAILABLE\" BASIS WITHOUT " +"WARRANTIES\n" +"OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO " +"WARRANTIES\n" +"OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR\n" +"OTHERWISE. WITHOUT LIMITATION, WE DISCLAIM ANY AND ALL WARRANTIES REGARDING " +"THE\n" +"SECURITY, RELIABILITY, TIMELINESS AND PERFORMANCE OF THE SERVICES OFFERED. " +"WE\n" +"MAKE NO WARRANTY, EXPRESS OR IMPLIED, THAT THE BTB SITE, THE CONTENT ON THE\n" +"SITE, AND THE SERVICES WILL BE UNINTERRUPTED, TIMELY OR ERROR-FREE. SOME\n" +"JURISDICTIONS DO NOT ALLOW THE DISCLAIMER OF CERTAIN WARRANTIES, SO SOME OF " +"THE\n" +"ABOVE DISCLAIMER MAY NOT APPLY TO YOU.\n" +"\n" +"Le Service est proposé \" tel que \" sans garantie de quelque nature que\n" +"ce soit, explicite ou implicite ou que le fonctionnement de la\n" +"Plateforme soit ininterrompu, rapide, sécurisé.\n" +"\n" +"

\n" +"

\n" +"TO THE EXTENT NOT PROHIBITED BY APPLICABLE LAW, IN NO EVENT SHALL BTB BE " +"LIABLE\n" +"FOR ANY DIRECT, INDIRECT, SPECIAL, OR CONSEQUENTIAL DAMAGES, REGARDLESS OF " +"THE\n" +"NATURE OF THE CLAIM OR THE FORM OF ACTION, ARISING FROM THE CONTENT ON THE\n" +"SITE, THE SERVICES, OR THE SITE, WHETHER OR NOT WE SHALL HAVE HAD ANY\n" +"KNOWLEDGE, ACTUAL OR CONSTRUCTIVE, THAT SUCH DAMAGES MIGHT BE INCURRED.\n" +"

\n" +"\n" +"

Eligibilité

\n" +"

\n" +"You must be 18 years of age or older to use this Site. By using the Site, " +"you\n" +"represent and warrant that you are 18 years of age or older.\n" +"

\n" +"\n" +"

Account, Password and Security

\n" +"

\n" +"You may create an account with BtB by providing a username and password.\n" +"Creating an account will allow you to create a user profile and make\n" +"contributions to the Site, including but not limited to posting comments " +"and\n" +"participating in the transcription process. Through the transcription " +"process,\n" +"accountholders may transcribe posted letters from the prisoners, and/or " +"edit\n" +"existing transcriptions to correct errors.\n" +"

\n" +"\n" +"

\n" +"You are solely responsible for maintaining the confidentiality and security " +"of\n" +"your password(s) and accounts(s). You are entirely responsible for all\n" +"activities that occur on or through your account(s).\n" +"

\n" +"\n" +"

\n" +"Users are prohibited from violating or attempting to violate the security " +"of\n" +"the Site, including, without limitation, (a) accessing data not intended " +"for\n" +"such user or logging into a server or account which the user is not " +"authorized\n" +"to access, (b) attempting to probe, scan or test the vulnerability of a " +"system\n" +"or network or to breach security or authentication measures without proper\n" +"authorization, (c) attempting to interfere with service to any user, host " +"or\n" +"network, including, without limitation, via means of submitting a virus to " +"the\n" +"Site, overloading, \"flooding,\" \"spamming,\" \"mailbombing\" or \"crashing," +"\" (d)\n" +"sending unsolicited e-mail, including promotions and/or advertising of " +"products\n" +"or services, or (e) forging any TCP/IP packet header or any part of the " +"header\n" +"information in any e-mail or newsgroup posting. Violations of system or " +"network\n" +"security may result in civil or criminal liability. You agree that it is " +"your\n" +"responsibility to install anti-virus software and related protections " +"against\n" +"viruses, Trojan horses, worms, time bombs, cancelbots or other computer\n" +"programming routines or engines that are intended to damage, destroy, " +"disrupt\n" +"or otherwise impair a computer’s functionality or operation.\n" +"\n" +"

\n" +"\n" +"

Creating Profiles and Posting Comments

\n" +"

\n" +"Accountholders can create user profiles by adding descriptions and/or " +"uploading\n" +"photos. They can also post comments to the prisoners’ letters. You alone " +"are\n" +"responsible for all content you add to the Site, including but not limited " +"to\n" +"the information and photos in your profile and the content in your posts. " +"You\n" +"agree not to post content that includes any defamatory, abusive, obscene,\n" +"threatening or illegal material, or any other material that infringes on " +"the\n" +"ability of others to enjoy the Site or that infringes on the rights of " +"others.\n" +"\n" +"En tant que simple fournisseur d’hébergement, Expression Carcérale ne sera " +"en\n" +"aucun cas responsable du contenu des blogs des Membres et des messages\n" +"que les Visiteurs pourront inscrire, quel que soit le support dudit\n" +"message, non plus que des contacts passés entre les Membres, les\n" +"Visiteurs et lesdits tiers, quels qu'ils soient.\n" +"\n" +"EC est un fournisseur d’hébergement. En aucun cas, EC ne peut être\n" +"assimilé à un éditeur ou un auteur relativement aux blogs des Membres.\n" +"\n" +"Contenus manifestement illicites :\n" +"\n" +"Le contenu publié par l’utilisateur ne doit pas inciter à la haine, à\n" +"la violence, à l'anorexie, à la fabrication et utilisation\n" +"d'explosifs, au suicide, au racisme, à l'antisémitisme, à la\n" +"xénophobie, à l’homophobie, faire l'apologie des crimes de guerre ou\n" +"des crimes contre l'humanité ;\n" +"\n" +"Le contenu publié par l'utilisateur ne doit présenter en aucun cas un\n" +"caractère pédophile ou pédo-pornographique.\n" +"\n" +"Le contenu publié par l’utilisateur ne doit pas inciter à commettre un\n" +"crime, un délit ou un acte de terrorisme ;\n" +"\n" +"Le contenu publié par l’utilisateur ne doit pas inciter à la\n" +"discrimination d'une personne ou d'un groupe de personne en raison de\n" +"son appartenance à une ethnie, à une religion, à une race, ou du fait\n" +"de son orientation sexuelle ou de son handicap.\n" +"\n" +"Dans le cadre de ses obligations de surveillance sur les contenus\n" +"manifestement illicites, édictées par la loi du 21 janvier 2004 pour\n" +"la confiance en l'économie numérique, l'association EC pourra\n" +"être amenée à consulter une copie des messages envoyé à l'éditeur d'un\n" +"blog via le formulaire de contact disponible sur le blog.\n" +"\n" +"\n" +"Contenus litigieux :\n" +"\n" +"L'utilisateur s'engage à prendre connaissance avant toute publication\n" +"des règles et limites relatives à la liberté d'expression. La liberté\n" +"d'expression autorise la critique, le rapport d'informations vérifiées\n" +"et prouvées, elle n'autorise pas le dénigrement et la\n" +"diffamation. Tout dénigrement, diffamation, ou allégation\n" +"d'informations inexactes ou volontairement tronquées pour en changer\n" +"le sens peuvent entrainer des poursuites à l'encontre de leur auteur.\n" +"\n" +"Le contenu publié par l’utilisateur ne doit pas porter atteinte aux\n" +"droits à la réputation, à la vie privée de tiers et à l'image ;\n" +"\n" +"Le contenu publié par l’utilisateur ne doit pas être, au strict sens\n" +"de la loi, dénigrant ou diffamatoire.\n" +"\n" +"La liberté d'expression autorise la critique dès lors qu'elle est\n" +"objective, argumentée, et portant sur des faits réels.\n" +"\n" +"\n" +"

\n" +"

\n" +"BtB cannot and does not review every profile or posting made on the Site. " +"You\n" +"should expect the Site to include information and opinions from a variety " +"of\n" +"individuals and organizations other than BtB. BtB does not endorse or\n" +"guarantee the accuracy of any posting, regardless of whether the posting " +"comes\n" +"from a prisoner, a web site user, a guest, or a member of our staff.\n" +"

\n" +"

\n" +"Although BtB cannot monitor all profiles and postings, BtB reserves the " +"right\n" +"(though not the obligation) to delete, move, or edit any profile content or\n" +"postings for any reason whatsoever.\n" +"\n" +"Malgré le fait que EC ne peux surveiller tout le contenu hebergé par\n" +"le site, EC se reserve le droit (et pas l'obligation) de supprimer,\n" +"déplacer, ou éditer tout contenu sur le site.\n" +"\n" +"alt: EC peut décider, à sa convenance, d'effacer ou de bloquer tout ou\n" +"partie du contenu d'un blog, notamment dans le cas où le membre ne\n" +"respecterait pas les présentes conditions. Dans ce cas, EC s'éfforcera\n" +"de présenter des explications au membre.\n" +"\n" +"Suite à la suppresison de contenu ou d'un compte, le Membre ne peux\n" +"demander à EC une quelconque indemnité.\n" +"\n" +"\n" +"\n" +"

\n" +"

Transcription

\n" +"

\n" +"An accountholder can prepare transcriptions of the prisoners’ posted " +"letters.\n" +"An accountholder can also edit an existing transcription in order to " +"correct\n" +"errors. You agree not to make changes to a transcription that is already\n" +"accurate.\n" +"

\n" +"\n" +"

\n" +"By transcribing a prisoner’s letter, you represent and warrant that you are\n" +"accurately transcribing the content of the prisoner’s letter. By making " +"edits\n" +"to a transcription, you represent and warrant that the edits are accurate. " +"BtB\n" +"does not endorse or guarantee the accuracy of any transcription.\n" +"

\n" +"\n" +"

\n" +"BtB reserves the right to lock transcription forms to prevent any further " +"edits\n" +"to a prisoner’s letter. BtB also reserves the right (though not the\n" +"obligation) to delete, move, or edit any transcriptions that BtB considers\n" +"unacceptable or inappropriate, whether for legal or other reasons.\n" +"

\n" +"\n" +"

Privacy

\n" +"

\n" +"BtB respects the privacy of our users. BtB’s Privacy Policy is expressly\n" +"incorporated herein by reference and made a part of the Terms. The Privacy\n" +"Policy is located at\n" +"%(base_url)s%(url_about_privacy)s.\n" +"

\n" +"

Termination of Account

\n" +"

\n" +"You may terminate your account via the link on your profile page.\n" +"

\n" +"\n" +"

\n" +"BtB reserves the right to terminate your account(s), to restrict your access " +"to\n" +"your account(s), and/or to delete any content posted through your account" +"(s),\n" +"with or without notice, for any or for no reason, and without any liability " +"to\n" +"you. The license granted to BtB by you in any and all content furnished by " +"you\n" +"to the Site is irrevocable and survives after termination of your account.\n" +"

\n" +"

\n" +"If you decide to terminate your account, you may opt to delete the comments " +"you\n" +"have posted to the Site. If you wish to delete your comments, you must do " +"so\n" +"at the time you terminate your account. Once your account is terminated, " +"you\n" +"will lose the ability to perform any authenticated functions on the Site,\n" +"including the ability to delete your comments.\n" +"

\n" +"\n" +"

\n" +"Un membre de EC peut demander la suppression de son compte ainsi que\n" +"des contenus hebergés sur la plate-forme.\n" +"\n" +"Téléchargement du contenu lors du départ d'un membre ? \n" +"\n" +"?? garder les URLs avec un message \"contenu suuprimé à la demande de " +"l'auteur\".\n" +"

\n" +"\n" +"

\n" +"

Prohibited Site Usage

\n" +"

\n" +"The Site and/or any portion of the Site may not be reproduced, duplicated,\n" +"copied, sold, resold, visited or otherwise exploited for any commercial " +"purpose\n" +"without our express written consent, except for such reproduction as occurs " +"in\n" +"the normal course of reading or viewing the Site using a Web browser. We do " +"not\n" +"permit any resale or commercial use of the Site or its contents; any " +"derivative\n" +"use of the Site or its contents; or any use of data mining, robots, or " +"similar\n" +"data gathering and extraction tools.\n" +"\n" +"Il est interdit de collecter ou stocker des données en vue de créer\n" +"une base de données concernant les Membres du Service, notamment leur\n" +"noms et prénoms; XXX - moteur de recherche ?\n" +"\n" +"\n" +"

\n" +"\n" +"EC s’engage à ne pas faire d’usage commercial des informations\n" +"personnelles concernant ses Membres.\n" +"\n" +"\n" +"

Parental Notice

\n" +"

Pursuant to 47 U.S.C. Section 230(d) as amended, BtB hereby notifies you\n" +"that parental control protections (such as computer hardware, software, or\n" +"filter services) are commercially available that may assist you in limiting\n" +"access to material that is harmful to minors. Information identifying " +"current\n" +"providers of such protection is available on the Internet (e.g.,\n" +"http://en.wikipedia.org/wiki/List_of_content-" +"control_software).\n" +"

\n" +"\n" +"

Intellectual Property

\n" +"

\n" +"By furnishing content to the Site, you grant BtB a non-exclusive, royalty-" +"free,\n" +"perpetual, and worldwide license to, among other things, copy, distribute,\n" +"transmit, publicly display, reproduce, edit, transcribe, translate, and\n" +"reformat the content you furnish, and/or to incorporate the content you " +"furnish\n" +"into a collective work. This license also allows BtB to, among other " +"things,\n" +"periodically print your comments and send the comments to prisoners. This\n" +"license is perpetual and applies even after a user’s account has been\n" +"terminated to content submitted by the user before termination of the " +"account.\n" +"Subject only to the rights granted to BtB under this license, you retain\n" +"ownership of the copyrights and all other rights in the content furnished " +"by\n" +"you.\n" +"

\n" +"

Representations and Warranties of Web Site User

\n" +"

\n" +"By submitting content to the Site, you represent and warrant, with respect " +"to\n" +"all content furnished by you, that you submit to BtB, as follows:\n" +"

\n" +"\n" +"
    \n" +"
  1. You are the sole author of all content, and all content is original to\n" +"you.
    2. \n" +"
  2. You have the right to submit the content to BtB and to grant BtB the " +"rights\n" +"set forth herein.
    3. \n" +"\n" +"Les Membres garantissent à EC qu'ils disposent des droits nécessaires\n" +"à la publication et / ou au partage des contenus qu'ils déposent sur\n" +"la plateforme du Service. Par droits, on entend les droits relevant du\n" +"Code de la propriété intellectuelle comme les droits d'auteur, de\n" +"reproduction, de diffusion, le droit des marques… sur tout support\n" +"existant ou à venir.\n" +"\n" +"\n" +"
  3. The content does not violate or constitute the infringement of any " +"patent,\n" +"copyright, trademark, trade secret, right of privacy, right of publicity, " +"moral\n" +"right, or other intellectual property right or other right of any person or\n" +"entity.
    4. \n" +"
  4. The content, your submission of the content to BtB, and the posting of " +"the\n" +"content online do not violate the rights of any person or entity or any " +"state\n" +"or federal law or regulation.
    5. \n" +"
  5. The content does not contain any threatening, harassing, libelous, " +"false,\n" +"defamatory, offensive, obscene, or pornographic material, or other material\n" +"that would violate any other applicable law or regulation.
    6. \n" +"
\n" +"\n" +"

\n" +"By submitting content to BtB, you acknowledge and agree that such content " +"may\n" +"be posted on the BtB website and made publicly available to anyone who " +"wishes\n" +"to view the content. You acknowledge and agree that BtB shall have no\n" +"responsibility, liability, or obligation to you with regard to the content\n" +"submitted, its protection, its use or misuse in any way whatsoever by any\n" +"entity, including but not limited to BtB itself. You acknowledge and agree\n" +"that BtB will in no event be liable for the editing, removal or disabling " +"of\n" +"access to any content under the Terms.\n" +"\n" +"\n" +"Le Membre reconnaît expressément que :\n" +"\n" +"- le contenu de son blog est sous sa seule responsabilité tant civile que " +"pénale en sa qualité d'auteur et d'éditeur du blog,\n" +"\n" +"- EC, en tant que fournisseur d’hébergement, n‘est en aucun cas responsable " +"des contenus que le Membre a publiés ou de toute autre information ou " +"communication du Membre (que ce soit des textes publiés, images, hyperliens " +"ou autre contenu),\n" +"\n" +"- EC n'assume vis à vis des contenus publiés par le Membre et les Visiteurs " +"aucune responsabilité quant à leur possible caractère menaçant, " +"anticonstitutionnel, vulgaire, raciste, pornographique, diffamatoire, " +"injurieux, offensant, criminel, dégradant ou violant le code de la propriété " +"intellectuelle et ou portant atteinte aux droits des marques.\n" +"\n" +"En tant qu’auteur et éditeur de son blog, le Membre s’engage à respecter sur " +"son blog les lois et règlements en vigueur en France.\n" +"\n" +"La plateforme EC permet en outre à toute personne de lui signaler\n" +"toutes données constituant une infraction par rapport aux lois et\n" +"règlements en vigueur, ainsi que contre les infractions à la loi du 29\n" +"juillet 1881 sur la liberté de la presse.\n" +"\n" +"Concernant les demandes de retrait ou de suppression de Blog, de\n" +"commentaires, de photos, la loi du 21 juin 2004 pour la confiance dans\n" +"l’économie numérique (LCEN) indique que les hébergeurs ne sont pas\n" +"responsables d'un contenu litigieux qu'ils hébergent dès lors qu'ils\n" +"n'a pas été porté régulièrement à leur connaissance le caractère\n" +"litigieux de ce contenu.\n" +"\n" +"Un tiers qui souhaite mettre fin à ce qu'il considère comme un\n" +"préjudice doit donc initialement prendre contact avec l'éditeur du\n" +"Site (par l'intermédiaire du formulaire contact présent en bas de\n" +"Blog), et s'il n'arrive pas à le contacter ou que l'éditeur du Blog\n" +"refuse de retirer le contenu notifié malgré une décision de justice\n" +"l'enjoignant à le faire, il devra justifier auprès de l'association EC\n" +"de cette impossibilité de contacter l'éditeur du Blog ou de faire\n" +"exécuter cette décision de justice.\n" +"\n" +"En tout état de cause, EC se réserve le droit de refuser de\n" +"donner suite à une notification abusive, c'est à dire une notification\n" +"qui n'ait pas été porté au préalable à la connaissance de l'éditeur du\n" +"Blog, ou une notification portant sur un contenu non manifestement\n" +"illicite.\n" +"\n" +"Dés que EC recevra la demande d’information émanant de la plainte d’un\n" +"utilisateur sur un Blog litigieux, de la part du Procureur de la\n" +"République, de la police ou de la gendarmerie ou de toute autre\n" +"autorité judiciaire, EC traitera dans les plus brefs délais cette\n" +"demande.\n" +"\n" +"

\n" +"\n" +"

?

\n" +"

\n" +" En conformité avec la loi du 6 janvier 1978 relative à\n" +" l'informatique, aux fichiers, aux libertés, le traitement\n" +" automatisé des données nominatives réalisé à partir du Site\n" +" Internet www.over-blog.com a fait l'objet d'une déclaration auprès\n" +" de la Commission Nationale de l'Informatique et des Libertés\n" +" (CNIL).\n" +"\n" +"

\n" +"\n" +"

Digital Millenium Copyright Act/Copyright Infringement and Notification " +"Policy

\n" +"

\n" +"We respect the intellectual property of others. If you believe that your\n" +"copyrighted materials have been copied in a way that constitutes copyright\n" +"infringement, please follow the procedure set forth in our Digital " +"Millennium\n" +"Copyright Act Notice Policy, which is located at\n" +"%(base_url)s%(url_about_dmca)s and is\n" +"expressly incorporated herein by reference and made a part of the Terms.\n" +"

\n" +"

Termination of Service

\n" +"

\n" +"BtB disclaims all responsibility and liability for the availability,\n" +"timeliness, security or reliability of BtB’s services or Site, or any " +"software\n" +"provided through the Site. BtB reserves the right to modify, suspend, or\n" +"discontinue the services or access to the Site without any notice at any " +"time\n" +"for any reason and without any liability to you.\n" +"\n" +"EC est un espace de libre-expression : aucune censure n'est pratiquée\n" +"sur les pages des éditeurs de Blogs, qui s'engagent en contrepartie à\n" +"respecter strictement les lois Françaises. Tout utilisateur peut\n" +"raconter, argumenter, critiquer ce qu'il désire, dès lors qu'il\n" +"respecte cette règle de base.\n" +"\n" +"

\n" +"

No Waiver of Terms

\n" +"

\n" +"Failure of BtB to exercise or enforce any right or provision of these Terms\n" +"shall not be deemed a waiver of such right or provision in that or any " +"other\n" +"instance.\n" +"

\n" +"

Indemnity

\n" +"

\n" +"You agree to indemnify and hold harmless BtB, its affiliates, subsidiaries,\n" +"officers and directors, agents, employees and partners, and any parties " +"with\n" +"whom BtB may contract to provide its services, from any third party claim " +"or\n" +"demand, including reasonable attorneys’ fees for damages and/or costs due to " +"or\n" +"arising out of your breach of your obligations under this the Terms.\n" +"

\n" +"\n" +"

Severability

\n" +"

\n" +"If any provision of the Terms shall be deemed unlawful, void, or for any " +"reason\n" +"unenforceable, then that provision shall be deemed severable from these " +"terms\n" +"and conditions and shall not affect the validity and enforceability of any\n" +"remaining provisions.\n" +"\n" +"Si une partie quelconque des CGU devait s'avérer illégale, invalide ou\n" +"inapplicable, le terme ou les termes en question seraient effacés des\n" +"CGU et les termes restants subsisteraient et garderaient leur pleine\n" +"force et leur plein effet et continueraient à être applicables.\n" +"\n" +"Ces CGU sont placées sous l'autorité de la législation Française. Tout\n" +"désaccord ou conflit qui ne se règle pas par la voie amiable relève de\n" +"la juridiction des tribunaux compétents.\n" +"

\n" +"\n" +"

Governing Law and Entire Agreement

\n" +"

These Terms are governed by the laws of the Commonwealth of " +"Massachusetts,\n" +"without regard to the rules of conflict of law that may cause the laws of\n" +"another jurisdiction to apply. You agree to the sole and exclusive " +"jurisdiction\n" +"and venue of the federal or state courts serving Massachusetts in the event " +"of\n" +"any dispute of any kind arising from or relating to the Site or Services, " +"or\n" +"your use or review of it. The Terms constitute the entire agreement " +"between\n" +"the parties with respect to the subject matter hereof and supersedes and\n" +"replaces all prior or contemporaneous understandings or agreements, written " +"or\n" +"oral, regarding such subject matter. If for any reason a court of competent\n" +"jurisdiction finds any provision or portion of these Terms to be " +"unenforceable,\n" +"the remainder of the Terms will continue in full force and effect.\n" +"

\n" +"\n" +"Identification de EC, hébergeur\n" +"\n" +"ExpressionCarcerale.fr\n" +"Association de 1901\n" +"Adresse : \n" +"XXXX\n" +"Publication au JO\n" +"Site déclaré à la CNIL ? \n" +"\n" +"Les serveurs des Sites sont hébergés en France par :\n" +"Online.fr Dedibox Illiane ? \n" +"\n" +"\n" +"

\n" +"Effective Date of the Agreement is 2010-11-15.\n" +"

\n" +msgstr "" + +#: templates/about/terms.html:13 +#, python-format +msgid "" +"\n" +"

General

\n" +"

\n" +"Welcome to Between the Bars (“BtB”). BtB is a blog platform for prisoners\n" +"who have no or limited access to broadcast media. Its mission is to " +"facilitate\n" +"communication between prisoners and the public through our website available " +"at\n" +"%(base_url)s (“the Site”).\n" +"

\n" +"\n" +"

\n" +"In order for BtB to operate this service effectively and responsibly, we " +"have\n" +"created ground rules for using the Site, which are set out in this document\n" +"(the “Terms”). By accessing, using, or contributing to the Site in any " +"way,\n" +"you agree to abide by the Terms. The Terms constitute a legally binding\n" +"Agreement between you and BtB. \n" +"

\n" +"\n" +"

\n" +"BtB may modify the Terms from time to time, at BtB’s discretion, and such\n" +"modifications shall be effective upon posting by BtB on the Site. Your\n" +"continued use of the Site after BtB posts revised Terms signifies your\n" +"acceptance of the revised Terms. It is therefore important that you review " +"the\n" +"Terms regularly to ensure you are updated as to any changes. \n" +"

\n" +"\n" +"

\n" +"We appreciate your understanding and are happy to answer any questions you " +"have\n" +"about these Terms. \n" +"

\n" +"\n" +"

\n" +"The following Terms apply to the Site and its services:\n" +"

\n" +"\n" +"

Disclaimer and Waiver of Certain Damages

\n" +"

\n" +"THE SITE AND CONTENT AND SERVICES OFFERED AT, THROUGH, OR IN CONNECTION " +"WITH\n" +"THE SITE ARE PROVIDED ON AN \"AS IS\" AND \"AS AVAILABLE\" BASIS WITHOUT " +"WARRANTIES\n" +"OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO " +"WARRANTIES\n" +"OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR\n" +"OTHERWISE. WITHOUT LIMITATION, WE DISCLAIM ANY AND ALL WARRANTIES REGARDING " +"THE\n" +"SECURITY, RELIABILITY, TIMELINESS AND PERFORMANCE OF THE SERVICES OFFERED. " +"WE\n" +"MAKE NO WARRANTY, EXPRESS OR IMPLIED, THAT THE BTB SITE, THE CONTENT ON THE\n" +"SITE, AND THE SERVICES WILL BE UNINTERRUPTED, TIMELY OR ERROR-FREE. SOME\n" +"JURISDICTIONS DO NOT ALLOW THE DISCLAIMER OF CERTAIN WARRANTIES, SO SOME OF " +"THE\n" +"ABOVE DISCLAIMER MAY NOT APPLY TO YOU.\n" +"

\n" +"

\n" +"TO THE EXTENT NOT PROHIBITED BY APPLICABLE LAW, IN NO EVENT SHALL BTB BE " +"LIABLE\n" +"FOR ANY DIRECT, INDIRECT, SPECIAL, OR CONSEQUENTIAL DAMAGES, REGARDLESS OF " +"THE\n" +"NATURE OF THE CLAIM OR THE FORM OF ACTION, ARISING FROM THE CONTENT ON THE\n" +"SITE, THE SERVICES, OR THE SITE, WHETHER OR NOT WE SHALL HAVE HAD ANY\n" +"KNOWLEDGE, ACTUAL OR CONSTRUCTIVE, THAT SUCH DAMAGES MIGHT BE INCURRED.\n" +"

\n" +"\n" +"

Eligibility

\n" +"

\n" +"You must be 18 years of age or older to use this Site. By using the Site, " +"you\n" +"represent and warrant that you are 18 years of age or older. \n" +"

\n" +"\n" +"

Account, Password and Security

\n" +"

\n" +"You may create an account with BtB by providing a username and password.\n" +"Creating an account will allow you to create a user profile and make\n" +"contributions to the Site, including but not limited to posting comments " +"and\n" +"participating in the transcription process. Through the transcription " +"process,\n" +"accountholders may transcribe posted letters from the prisoners, and/or " +"edit\n" +"existing transcriptions to correct errors. \n" +"

\n" +"\n" +"

\n" +"You are solely responsible for maintaining the confidentiality and security " +"of\n" +"your password(s) and accounts(s). You are entirely responsible for all\n" +"activities that occur on or through your account(s).\n" +"

\n" +"\n" +"

\n" +"Users are prohibited from violating or attempting to violate the security " +"of\n" +"the Site, including, without limitation, (a) accessing data not intended " +"for\n" +"such user or logging into a server or account which the user is not " +"authorized\n" +"to access, (b) attempting to probe, scan or test the vulnerability of a " +"system\n" +"or network or to breach security or authentication measures without proper\n" +"authorization, (c) attempting to interfere with service to any user, host " +"or\n" +"network, including, without limitation, via means of submitting a virus to " +"the\n" +"Site, overloading, \"flooding,\" \"spamming,\" \"mailbombing\" or \"crashing," +"\" (d)\n" +"sending unsolicited e-mail, including promotions and/or advertising of " +"products\n" +"or services, or (e) forging any TCP/IP packet header or any part of the " +"header\n" +"information in any e-mail or newsgroup posting. Violations of system or " +"network\n" +"security may result in civil or criminal liability. You agree that it is " +"your\n" +"responsibility to install anti-virus software and related protections " +"against\n" +"viruses, Trojan horses, worms, time bombs, cancelbots or other computer\n" +"programming routines or engines that are intended to damage, destroy, " +"disrupt\n" +"or otherwise impair a computer’s functionality or operation.\n" +"

\n" +"\n" +"

Creating Profiles and Posting Comments

\n" +"

\n" +"Accountholders can create user profiles by adding descriptions and/or " +"uploading\n" +"photos. They can also post comments to the prisoners’ letters. You alone " +"are\n" +"responsible for all content you add to the Site, including but not limited " +"to\n" +"the information and photos in your profile and the content in your posts. " +"You\n" +"agree not to post content that includes any defamatory, abusive, obscene,\n" +"threatening or illegal material, or any other material that infringes on " +"the\n" +"ability of others to enjoy the Site or that infringes on the rights of " +"others.\n" +"

\n" +"

\n" +"BtB cannot and does not review every profile or posting made on the Site. " +"You\n" +"should expect the Site to include information and opinions from a variety " +"of\n" +"individuals and organizations other than BtB. BtB does not endorse or\n" +"guarantee the accuracy of any posting, regardless of whether the posting " +"comes\n" +"from a prisoner, a web site user, a guest, or a member of our staff.\n" +"

\n" +"

\n" +"Although BtB cannot monitor all profiles and postings, BtB reserves the " +"right\n" +"(though not the obligation) to delete, move, or edit any profile content or\n" +"postings for any reason whatsoever.\n" +"

\n" +"

Transcription

\n" +"

\n" +"An accountholder can prepare transcriptions of the prisoners’ posted " +"letters.\n" +"An accountholder can also edit an existing transcription in order to " +"correct\n" +"errors. You agree not to make changes to a transcription that is already\n" +"accurate. \n" +"

\n" +"\n" +"

\n" +"By transcribing a prisoner’s letter, you represent and warrant that you are\n" +"accurately transcribing the content of the prisoner’s letter. By making " +"edits\n" +"to a transcription, you represent and warrant that the edits are accurate. " +"BtB\n" +"does not endorse or guarantee the accuracy of any transcription.\n" +"

\n" +"\n" +"

\n" +"BtB reserves the right to lock transcription forms to prevent any further " +"edits\n" +"to a prisoner’s letter. BtB also reserves the right (though not the\n" +"obligation) to delete, move, or edit any transcriptions that BtB considers\n" +"unacceptable or inappropriate, whether for legal or other reasons.\n" +"

\n" +"\n" +"

Privacy

\n" +"

\n" +"BtB respects the privacy of our users. BtB’s Privacy Policy is expressly\n" +"incorporated herein by reference and made a part of the Terms. The Privacy\n" +"Policy is located at \n" +"%(base_url)s%(url_about_privacy)s.\n" +"

\n" +"

Termination of Account

\n" +"

\n" +"You may terminate your account via the link on your profile page. \n" +"

\n" +"\n" +"

\n" +"BtB reserves the right to terminate your account(s), to restrict your access " +"to\n" +"your account(s), and/or to delete any content posted through your account" +"(s),\n" +"with or without notice, for any or for no reason, and without any liability " +"to\n" +"you. The license granted to BtB by you in any and all content furnished by " +"you\n" +"to the Site is irrevocable and survives after termination of your account.\n" +"

\n" +"

\n" +"If you decide to terminate your account, you may opt to delete the comments " +"you\n" +"have posted to the Site. If you wish to delete your comments, you must do " +"so\n" +"at the time you terminate your account. Once your account is terminated, " +"you\n" +"will lose the ability to perform any authenticated functions on the Site,\n" +"including the ability to delete your comments.\n" +"

\n" +"

\n" +"

Prohibited Site Usage

\n" +"

\n" +"The Site and/or any portion of the Site may not be reproduced, duplicated,\n" +"copied, sold, resold, visited or otherwise exploited for any commercial " +"purpose\n" +"without our express written consent, except for such reproduction as occurs " +"in\n" +"the normal course of reading or viewing the Site using a Web browser. We do " +"not\n" +"permit any resale or commercial use of the Site or its contents; any " +"derivative\n" +"use of the Site or its contents; or any use of data mining, robots, or " +"similar\n" +"data gathering and extraction tools.\n" +"

\n" +"\n" +"

Parental Notice

\n" +"

Pursuant to 47 U.S.C. Section 230(d) as amended, BtB hereby notifies you\n" +"that parental control protections (such as computer hardware, software, or\n" +"filter services) are commercially available that may assist you in limiting\n" +"access to material that is harmful to minors. Information identifying " +"current\n" +"providers of such protection is available on the Internet (e.g., \n" +"http://en.wikipedia.org/wiki/List_of_content-" +"control_software).\n" +"

\n" +"\n" +"

Intellectual Property

\n" +"

\n" +"By furnishing content to the Site, you grant BtB a non-exclusive, royalty-" +"free,\n" +"perpetual, and worldwide license to, among other things, copy, distribute,\n" +"transmit, publicly display, reproduce, edit, transcribe, translate, and\n" +"reformat the content you furnish, and/or to incorporate the content you " +"furnish\n" +"into a collective work. This license also allows BtB to, among other " +"things,\n" +"periodically print your comments and send the comments to prisoners. This\n" +"license is perpetual and applies even after a user’s account has been\n" +"terminated to content submitted by the user before termination of the " +"account.\n" +"Subject only to the rights granted to BtB under this license, you retain\n" +"ownership of the copyrights and all other rights in the content furnished " +"by\n" +"you.\n" +"

\n" +"

Representations and Warranties of Web Site User

\n" +"

\n" +"By submitting content to the Site, you represent and warrant, with respect " +"to\n" +"all content furnished by you, that you submit to BtB, as follows:\n" +"

\n" +"\n" +"
    \n" +"
  1. You are the sole author of all content, and all content is original to\n" +"you.
    2. \n" +"
  2. You have the right to submit the content to BtB and to grant BtB the " +"rights\n" +"set forth herein.
    3. \n" +"
  3. The content does not violate or constitute the infringement of any " +"patent,\n" +"copyright, trademark, trade secret, right of privacy, right of publicity, " +"moral\n" +"right, or other intellectual property right or other right of any person or\n" +"entity.
    4. \n" +"
  4. The content, your submission of the content to BtB, and the posting of " +"the\n" +"content online do not violate the rights of any person or entity or any " +"state\n" +"or federal law or regulation.
    5. \n" +"
  5. The content does not contain any threatening, harassing, libelous, " +"false,\n" +"defamatory, offensive, obscene, or pornographic material, or other material\n" +"that would violate any other applicable law or regulation.
    6. \n" +"
\n" +"\n" +"

\n" +"By submitting content to BtB, you acknowledge and agree that such content " +"may\n" +"be posted on the BtB website and made publicly available to anyone who " +"wishes\n" +"to view the content. You acknowledge and agree that BtB shall have no\n" +"responsibility, liability, or obligation to you with regard to the content\n" +"submitted, its protection, its use or misuse in any way whatsoever by any\n" +"entity, including but not limited to BtB itself. You acknowledge and agree\n" +"that BtB will in no event be liable for the editing, removal or disabling " +"of\n" +"access to any content under the Terms.\n" +"

\n" +"\n" +"

Digital Millenium Copyright Act/Copyright Infringement and Notification " +"Policy

\n" +"

\n" +"We respect the intellectual property of others. If you believe that your\n" +"copyrighted materials have been copied in a way that constitutes copyright\n" +"infringement, please follow the procedure set forth in our Digital " +"Millennium\n" +"Copyright Act Notice Policy, which is located at \n" +"%(base_url)s%(url_about_dmca)s and is\n" +"expressly incorporated herein by reference and made a part of the Terms.\n" +"

\n" +"

Termination of Service

\n" +"

\n" +"BtB disclaims all responsibility and liability for the availability,\n" +"timeliness, security or reliability of BtB’s services or Site, or any " +"software\n" +"provided through the Site. BtB reserves the right to modify, suspend, or\n" +"discontinue the services or access to the Site without any notice at any " +"time\n" +"for any reason and without any liability to you.\n" +"

\n" +"

No Waiver of Terms

\n" +"

\n" +"Failure of BtB to exercise or enforce any right or provision of these Terms\n" +"shall not be deemed a waiver of such right or provision in that or any " +"other\n" +"instance.\n" +"

\n" +"

Indemnity

\n" +"

\n" +"You agree to indemnify and hold harmless BtB, its affiliates, subsidiaries,\n" +"officers and directors, agents, employees and partners, and any parties " +"with\n" +"whom BtB may contract to provide its services, from any third party claim " +"or\n" +"demand, including reasonable attorneys’ fees for damages and/or costs due to " +"or\n" +"arising out of your breach of your obligations under this the Terms. \n" +"

\n" +" \n" +"

Severability

\n" +"

\n" +"If any provision of the Terms shall be deemed unlawful, void, or for any " +"reason\n" +"unenforceable, then that provision shall be deemed severable from these " +"terms\n" +"and conditions and shall not affect the validity and enforceability of any\n" +"remaining provisions.\n" +"

\n" +"\n" +"

Governing Law and Entire Agreement

\n" +"

These Terms are governed by the laws of the Commonwealth of " +"Massachusetts,\n" +"without regard to the rules of conflict of law that may cause the laws of\n" +"another jurisdiction to apply. You agree to the sole and exclusive " +"jurisdiction\n" +"and venue of the federal or state courts serving Massachusetts in the event " +"of\n" +"any dispute of any kind arising from or relating to the Site or Services, " +"or\n" +"your use or review of it. The Terms constitute the entire agreement " +"between\n" +"the parties with respect to the subject matter hereof and supersedes and\n" +"replaces all prior or contemporaneous understandings or agreements, written " +"or\n" +"oral, regarding such subject matter. If for any reason a court of competent\n" +"jurisdiction finds any provision or portion of these Terms to be " +"unenforceable,\n" +"the remainder of the Terms will continue in full force and effect.\n" +"

\n" +"\n" +"

\n" +"Effective Date of the Agreement is 2010-11-15.\n" +"

\n" +msgstr "" + +#: templates/blogs/_blog_cloud.html:6 msgid "Categories" msgstr "Categories" -#: templates/blogs/_blog_cloud.html:9 templates/blogs/_blog_cloud.html:47 +#: templates/blogs/_blog_cloud.html:10 templates/blogs/_blog_cloud.html:48 #: templates/blogs/all_posts_list.html:2 msgid "Recent posts" msgstr "Articles récents" -#: templates/blogs/_blog_cloud.html:13 +#: templates/blogs/_blog_cloud.html:14 +#: templates/correspondence/base_letter_list.html:138 +#: templates/correspondence/show_commentmailing.html:37 +#: templates/moderation/stats.html:77 +#: templates/profiles/profile_detail.html:81 msgid "Comments" msgstr "Commentaires" -#: templates/blogs/_blog_cloud.html:17 +#: templates/blogs/_blog_cloud.html:18 msgid "Authors" msgstr "Auteurs" -#: templates/blogs/_blog_cloud.html:20 +#: templates/blogs/_blog_cloud.html:21 msgid "Every Page" msgstr "Toutes les pages" -#: templates/blogs/_blog_cloud.html:26 +#: templates/blogs/_blog_cloud.html:27 msgid "Posts by category" msgstr "Articles par categorie" -#: templates/blogs/_blog_cloud.html:55 +#: templates/blogs/_blog_cloud.html:56 msgid "All posts by date" msgstr "Tous les articles par date" -#: templates/blogs/_blog_cloud.html:64 +#: templates/blogs/_blog_cloud.html:65 #: templates/blogs/_post_bottom_line.html:22 -#: templates/blogs/_sharing_buttons.html:2 -#: templates/blogs/all_comments_list.html:15 -#: templates/blogs/author_post_list.html:4 -#: templates/blogs/author_post_list.html:12 +#: templates/blogs/_sharing_buttons.html:3 +#: templates/blogs/all_comments_list.html:7 +#: templates/blogs/author_post_list.html:3 +#: templates/blogs/author_post_list.html:14 #: templates/blogs/post_detail.html:30 +#: templates/notification/notice_settings.html:49 +#: templates/subscriptions/subscribe_to.html:11 msgid "by" msgstr "par" -#: templates/blogs/_blog_cloud.html:67 +#: templates/blogs/_blog_cloud.html:68 msgid "All comments" msgstr "Tous les commentaires" -#: templates/blogs/_blog_cloud.html:72 +#: templates/blogs/_blog_cloud.html:73 msgid "Authors with recent posts" msgstr "Auteurs ayant des articles récents" -#: templates/blogs/_blog_cloud.html:78 +#: templates/blogs/_blog_cloud.html:79 templates/profiles/groups_list.html:87 msgid "profile" msgstr "profil" -#: templates/blogs/_blog_cloud.html:83 +#: templates/blogs/_blog_cloud.html:84 #: templates/profiles/profiles_list.html:10 msgid "All authors" msgstr "Tous les auteurs" @@ -353,6 +1689,7 @@ msgstr "Lire plus »" #: templates/blogs/_post_bottom_line.html:20 #: templates/blogs/post_detail.html:28 +#: templates/correspondence/delete_letter_confirm.html:15 msgid "From" msgstr "De" @@ -385,27 +1722,27 @@ msgstr "télétransmis" msgid "Original (PDF)" msgstr "Original (PDF)" -#: templates/blogs/_post_tag_list.html:3 -msgid "filed under" -msgstr "enregistré sous" - #: templates/blogs/_post_title_line.html:23 msgid "Flag post" msgstr "Signaler ce contenu" #: templates/blogs/_post_title_line.html:30 +#: templates/profiles/profile_detail.html:27 msgid "Click to read the transcription" msgstr "Cliquez pour lire la retranscription" #: templates/blogs/_post_title_line.html:31 +#: templates/profiles/profile_detail.html:28 msgid "Transcribed" msgstr "Retranscris" #: templates/blogs/_post_title_line.html:36 +#: templates/profiles/profile_detail.html:32 msgid "Partially transcribed" msgstr "Retranscris partiellement" #: templates/blogs/_post_title_line.html:43 +#: templates/profiles/profile_detail.html:39 msgid "Add transcription" msgstr "Ajouter une transcription" @@ -420,43 +1757,40 @@ msgid "Tags" msgstr "Tags" #: templates/blogs/_post_title_line.html:73 +#: templates/moderation/_common.html:24 templates/moderation/_scans.html:114 #: templates/scanning/transcription_edit.html:117 msgid "Save" msgstr "Enregistrer" -#: templates/blogs/_related.html:29 -msgid "More" -msgstr "Plus" - -#: templates/blogs/_sharing_buttons.html:1 +#: templates/blogs/_sharing_buttons.html:2 msgid "Share this" msgstr "Partager" -#: templates/blogs/_sharing_buttons.html:2 +#: templates/blogs/_sharing_buttons.html:3 msgid "at" msgstr "sur" -#: templates/blogs/_sharing_buttons.html:2 +#: templates/blogs/_sharing_buttons.html:3 msgid "Share on twitter" msgstr "Partager via twitter" -#: templates/blogs/_sharing_buttons.html:2 +#: templates/blogs/_sharing_buttons.html:3 msgid "Share on facebook" msgstr "Partager via facebook" -#: templates/blogs/_sharing_buttons.html:2 +#: templates/blogs/_sharing_buttons.html:3 msgid "Share on Pinterest" msgstr "Partager via Pinterest" -#: templates/blogs/all_comments_list.html:8 +#: templates/blogs/all_comments_list.html:5 msgid "Recent Comments" msgstr "Commentaires récents" -#: templates/blogs/all_comments_list.html:15 +#: templates/blogs/all_comments_list.html:6 msgid "Posted on" msgstr "Publié sur" -#: templates/blogs/all_comments_list.html:32 +#: templates/blogs/all_comments_list.html:8 msgid "More comments" msgstr "Plus de commentaires" @@ -472,10 +1806,6 @@ msgstr "Mes entrées de blog" msgid "Compose" msgstr "Écrire" -#: templates/blogs/base_post_list.html:23 -msgid "More posts" -msgstr "Plus d'articles" - #: templates/blogs/blogs_front_page.html:3 msgid "Blogs from writers in prison" msgstr "Blogs d'écrivains en prison" @@ -501,6 +1831,8 @@ msgid "Delete post" msgstr "Supprimer l'article" #: templates/blogs/delete_post.html:16 +#: templates/comments/delete_comment.html:11 +#: templates/moderation/_notes.html:26 #: templates/scanning/transcription_edit.html:118 msgid "Cancel" msgstr "Annuler" @@ -516,7 +1848,9 @@ msgstr "Écrire un article" #: templates/blogs/edit_post.html:29 msgid "" "If you'd like to remove the post, click “Delete post“ below." -msgstr "Si vous souhaitez supprimer cet article, cliquez sur “Supprimer l'article“ ci-dessous." +msgstr "" +"Si vous souhaitez supprimer cet article, cliquez sur “Supprimer " +"l'article“ ci-dessous." #: templates/blogs/edit_post.html:38 msgid "(optional) Comma separated list of categories" @@ -539,10 +1873,14 @@ msgid "Title" msgstr "Titre" #: templates/blogs/manage_posts.html:13 +#: templates/moderation/manage_tasks.html:44 msgid "Status" msgstr "Status" #: templates/blogs/manage_posts.html:14 +#: templates/moderation/manage_tasks.html:43 +#: templates/notification/notices.html:16 +#: templates/scanning/revision_list.html:28 msgid "Date" msgstr "Date" @@ -551,10 +1889,12 @@ msgid "Draft" msgstr "Brouillon" #: templates/blogs/manage_posts.html:27 +#: templates/moderation/_dashboard.html:18 templates/moderation/stats.html:38 msgid "Ready to publish" msgstr "Prêt à la publication" #: templates/blogs/manage_posts.html:30 +#: templates/moderation/_dashboard.html:19 templates/moderation/stats.html:37 msgid "Published" msgstr "Publié" @@ -578,53 +1918,60 @@ msgstr "Articles récent des auteurs lié à " msgid "By the page" msgstr "Par page" -#: templates/blogs/page_picker.html:45 +#: templates/blogs/page_picker.html:46 msgid "" "This page requires javsacript. To browse Between the Bars without " "javascript, try" -msgstr "Cette page nécésite javascript. Pour nagiguer sans javascript, essayez " +msgstr "" +"Cette page nécésite javascript. Pour nagiguer sans javascript, " +"essayez " -#: templates/blogs/page_picker.html:45 +#: templates/blogs/page_picker.html:46 msgid "blogs" msgstr "blogs" -#: templates/blogs/page_picker.html:47 +#: templates/blogs/page_picker.html:48 msgid "Every page" msgstr "Toutes les pages" -#: templates/blogs/page_picker.html:50 +#: templates/blogs/page_picker.html:51 msgid "Loading..." msgstr "Chargement..." -#: templates/blogs/page_picker.html:53 +#: templates/blogs/page_picker.html:54 msgid "That's all so far" msgstr "C'est tout pour l'instant" -#: templates/blogs/page_picker.html:54 +#: templates/blogs/page_picker.html:55 msgid "help us grow" msgstr "aidez nous à grandir" #: templates/blogs/post_detail.html:32 msgid "" "author's profile" -msgstr "le profil de l'auteur" +msgstr "" +"le profil de " +"l'auteur" #: templates/blogs/post_detail.html:43 msgid "This post is in reply to comments on" msgstr "Cet article est en réponse aux commentaires sur" #: templates/blogs/post_detail.html:75 -#: templates/profiles/profile_detail.html:44 +#: templates/profiles/profile_detail.html:56 +#: templates/profiles/profile_edit.html:43 msgid "Transcription" msgstr "Retranscription" -#: templates/blogs/post_detail.html:79 -#: templates/profiles/profile_detail.html:48 +#: templates/blogs/post_detail.html:79 templates/comments/_comment.html:35 +#: templates/notification/notice_settings.html:10 +#: templates/profiles/profile_detail.html:60 +#: templates/profiles/profile_edit.html:44 msgid "edit" msgstr "editer" #: templates/blogs/post_detail.html:80 -#: templates/profiles/profile_detail.html:49 +#: templates/profiles/profile_detail.html:61 #: templates/scanning/revision_list.html:5 msgid "revisions" msgstr "révisions" @@ -637,70 +1984,1061 @@ msgstr "Réponses" msgid "Replies feed" msgstr "Flux des réponses" -#: templates/blogs/tag_post_list.html:4 templates/blogs/tag_post_list.html:11 +#: templates/blogs/tag_post_list.html:3 +#: templates/notification/notice_settings.html:56 msgid "Posts tagged" msgstr "Articles ayant un tag" -#: templates/blogs/tag_post_list.html:6 templates/blogs/tag_post_list.html:13 +#: templates/blogs/tag_post_list.html:4 msgid "Uncategorized posts" msgstr "Articles sans catégorie" -#: templates/comments/_comment_form.html:19 -msgid "Send Reply »" -msgstr "Envoyé une réponse »" +#: templates/comments/_comment.html:34 templates/comments/edit_comment.html:2 +#: templates/comments/edit_comment.html:4 +#, fuzzy +msgid "Edit comment" +msgstr "Commentaires récents" -#: templates/comments/preview.html:4 templates/comments/preview.html.py:13 -msgid "Preview your comment" -msgstr "Avoir un aperçu de votre commentaire" +#: templates/comments/_comment.html:39 +#, fuzzy +msgid "Delete comment" +msgstr "Commentaires récents" -#: templates/comments/preview.html:11 -msgid "Please correct the error below" -msgid_plural "Please correct the errors below" -msgstr[0] "Merci de corriger l'erreur ci-dessous" -msgstr[1] "Merci de corriger les erreurs ci-dessous" +#: templates/comments/_comment.html:40 templates/notification/notices.html:27 +msgid "delete" +msgstr "" -#: templates/comments/preview.html:28 -msgid "and" -msgstr "et" +#: templates/comments/_comment.html:46 +#, fuzzy +msgid "Flag comment" +msgstr "Tous les commentaires" -#: templates/comments/preview.html:28 -msgid "Post your comment" -msgstr "Publiez votre commentaire" +#: templates/comments/_comment.html:55 +#, fuzzy +msgid "scanned reply" +msgstr "Profil scanné" -#: templates/comments/preview.html:28 -msgid "or make changes" -msgstr "ou faites des changement" +#: templates/comments/_comment.html:56 +msgid "view as blog post" +msgstr "" -#: templates/comments/preview.html:44 -msgid "Preview" -msgstr "Aperçu" +#: templates/comments/_comment_form.html:6 +msgid "" +"\n" +"\t We will print and mail your reply by .\n" +"\t " +msgstr "" + +#: templates/comments/_comment_form.html:10 +#, fuzzy +msgid "Guidelines" +msgstr "Guide de la communauté" + +#: templates/comments/_comment_form.html:21 +msgid "Send Reply »" +msgstr "Envoyé une réponse »" + +#: templates/comments/delete_comment.html:4 +#: templates/comments/delete_comment.html:10 +#, fuzzy +msgid "Delete reply" +msgstr "Supprimer l'article" + +#: templates/comments/delete_comment.html:5 +msgid "Are you sure you want to delete this reply? There is no undo." +msgstr "" + +#: templates/comments/edit_comment.html:6 +#, python-format +msgid "" +"\n" +" Please consider our guidelines while " +"writing.\n" +" " +msgstr "" + +#: templates/comments/edit_comment.html:17 +#, fuzzy +msgid "Save changes" +msgstr "ou faites des changement" + +#: templates/comments/preview.html:4 templates/comments/preview.html.py:17 +msgid "Preview your comment" +msgstr "Avoir un aperçu de votre commentaire" + +#: templates/comments/preview.html:12 +#, fuzzy +msgid "" +"\n" +" Please correct the error below" +msgid_plural "" +"Please correct the errors below\n" +" " +msgstr[0] "Merci de corriger l'erreur ci-dessous" +msgstr[1] "Merci de corriger les erreurs ci-dessous" + +#: templates/comments/preview.html:32 +msgid "and" +msgstr "et" + +#: templates/comments/preview.html:34 +msgid "Post your comment" +msgstr "Publiez votre commentaire" + +#: templates/comments/preview.html:35 +msgid "or make changes" +msgstr "ou faites des changement" + +#: templates/comments/preview.html:52 +msgid "Preview" +msgstr "Aperçu" + +#: templates/correspondence/base.html:9 +msgid "Pending" +msgstr "" + +#: templates/correspondence/base.html:12 +#: templates/correspondence/base_letter_list.html:48 +msgid "Sent" +msgstr "" + +#: templates/correspondence/base.html:15 +msgid "Write a letter" +msgstr "" + +#: templates/correspondence/base_letter_list.html:7 +#: templates/correspondence/pending.html:3 +msgid "Manage correspondence" +msgstr "Gérer la correspondance" + +#: templates/correspondence/base_letter_list.html:18 +msgid "Changed letter sent status." +msgstr "Status d'envoi de la lettre modifié" + +#: templates/correspondence/base_letter_list.html:47 +msgid "Recipient" +msgstr "" + +#: templates/correspondence/base_letter_list.html:49 +msgid "Letters" +msgstr "" + +#: templates/correspondence/base_letter_list.html:50 +msgid "Date created" +msgstr "" + +#: templates/correspondence/base_letter_list.html:51 +msgid "Sender" +msgstr "" + +#: templates/correspondence/base_letter_list.html:64 +msgid "Address missing" +msgstr "" + +#: templates/correspondence/base_letter_list.html:66 +msgid "Add one?" +msgstr "" + +#: templates/correspondence/base_letter_list.html:88 +msgid "Consent form: joined" +msgstr "" + +#: templates/correspondence/base_letter_list.html:97 +msgid "Signup complete" +msgstr "" + +#: templates/correspondence/base_letter_list.html:107 +#, fuzzy +msgid "First post" +msgstr "Edition de l'article" + +#: templates/correspondence/base_letter_list.html:118 +msgid "Letter" +msgstr "" + +#: templates/correspondence/base_letter_list.html:134 +msgid "Build comment mailing (PDF)" +msgstr "" + +#: templates/correspondence/base_letter_list.html:159 +msgid "Remove" +msgstr "" + +#: templates/correspondence/base_letter_list.html:173 +msgid "Show waitlist postcard" +msgstr "" + +#: templates/correspondence/base_letter_list.html:175 +#, fuzzy +msgid "Waitlist" +msgstr "Liste de discussion" + +#: templates/correspondence/delete_letter_confirm.html:2 +msgid "Confirm delete letter" +msgstr "" + +#: templates/correspondence/delete_letter_confirm.html:6 +msgid "Are you sure you want to delete this letter?" +msgstr "" + +#: templates/correspondence/delete_letter_confirm.html:8 +#, fuzzy +msgid "Delete letter" +msgstr "Supprimer l'article" + +#: templates/correspondence/delete_letter_confirm.html:10 +#: templates/moderation/_common.html:25 +#: templates/profiles/profile_edit.html:31 +#, fuzzy +msgid "cancel" +msgstr "Annuler" + +#: templates/correspondence/delete_letter_confirm.html:14 +msgid "To" +msgstr "" + +#: templates/correspondence/mass_mailing_spreadsheet.html:2 +msgid "Mass mailing spreadsheet" +msgstr "" + +#: templates/correspondence/mass_mailing_spreadsheet.html:4 +msgid "Mass Mailing Spreadsheet" +msgstr "" + +#: templates/correspondence/mass_mailing_spreadsheet.html:6 +msgid "Spreadsheets for users in the following organizations:" +msgstr "" + +#: templates/correspondence/mass_mailing_spreadsheet.html:10 +#, fuzzy +msgid "All users in" +msgstr "Tous les auteurs" + +#: templates/correspondence/mass_mailing_spreadsheet.html:16 +msgid "In prison" +msgstr "" + +#: templates/correspondence/mass_mailing_spreadsheet.html:18 +msgid "In the system, with returned license agreement or without." +msgstr "" + +#: templates/correspondence/mass_mailing_spreadsheet.html:22 +msgid "Invitable" +msgstr "" + +#: templates/correspondence/mass_mailing_spreadsheet.html:24 +msgid "" +"On the waitlist or not yet waitlisted -- we could send them an invitation." +msgstr "" + +#: templates/correspondence/mass_mailing_spreadsheet.html:28 +msgid "Waitlistable" +msgstr "" + +#: templates/correspondence/mass_mailing_spreadsheet.html:30 +msgid "" +"We have their name, but we haven't invited them, nor have we sent a waitlist " +"postcard." +msgstr "" + +#: templates/correspondence/mass_mailing_spreadsheet.html:34 +msgid "Waitlisted" +msgstr "" + +#: templates/correspondence/mass_mailing_spreadsheet.html:36 +msgid "" +"We have sent them a waitlist postcard, and we haven't sent an invitation." +msgstr "" + +#: templates/correspondence/mass_mailing_spreadsheet.html:40 +msgid "Invited users in" +msgstr "" + +#: templates/correspondence/mass_mailing_spreadsheet.html:47 +msgid "Invited" +msgstr "" + +#: templates/correspondence/mass_mailing_spreadsheet.html:49 +msgid "" +"An invitation has been sent, but license agreement has not been returned." +msgstr "" + +#: templates/correspondence/mass_mailing_spreadsheet.html:53 +msgid "Enrolled" +msgstr "" + +#: templates/correspondence/mass_mailing_spreadsheet.html:55 +msgid "In prison, have returned a license agreement." +msgstr "" + +#: templates/correspondence/mass_mailing_spreadsheet.html:59 +msgid "Bloggers with published content" +msgstr "" + +#: templates/correspondence/mass_mailing_spreadsheet.html:61 +msgid "Have a post or profile published." +msgstr "" + +#: templates/correspondence/pending.html:6 +#, fuzzy +msgid "Pending correspondence" +msgstr "Correspondance envoyée" + +#: templates/correspondence/pending.html:9 +#, fuzzy +msgid "Update pending correspondence" +msgstr "Gérer la correspondance" + +#: templates/correspondence/pending.html:11 +msgid "Refreshes all 'automatic' pending correspondence." +msgstr "" + +#: templates/correspondence/pending.html:15 +msgid "Waitlist consent requests" +msgstr "" + +#: templates/correspondence/pending.html:17 +msgid "" +"\n" +" Generates \"waitlist\" postcards for all consent requests that haven't " +"received them.\n" +" " +msgstr "" + +#: templates/correspondence/pending.html:25 +msgid "Collated mailings:" +msgstr "" + +#: templates/correspondence/pending.html:28 +msgid "Include consent envelopes?" +msgstr "" + +#: templates/correspondence/pending.html:32 +msgid "Before date" +msgstr "" + +#: templates/correspondence/pending.html:42 +msgid "Include waitlist postcards?" +msgstr "" + +#: templates/correspondence/pending.html:48 +msgid "" +"\n" +"\t\tInclude \"signup complete\" letters?\n" +"\t\t" +msgstr "" + +#: templates/correspondence/pending.html:56 +msgid "Include first posts?" +msgstr "" + +#: templates/correspondence/pending.html:62 +#, fuzzy +msgid "Include comments?" +msgstr "Tous les commentaires" + +#: templates/correspondence/pending.html:68 +msgid "Include personal letters?" +msgstr "" + +#: templates/correspondence/pending.html:76 +msgid "Build collated mailing" +msgstr "" + +#: templates/correspondence/pending.html:82 +#, fuzzy +msgid "Mailings:" +msgstr "Liste de discussion" + +#: templates/correspondence/sent.html:4 templates/correspondence/sent.html:8 +msgid "Sent correspondence" +msgstr "Correspondance envoyée" + +#: templates/correspondence/show_commentmailing.html:10 +#, python-format +msgid "" +"\n" +" Recent comments left for %(recipient_profile)s\n" +" " +msgstr "" + +#: templates/correspondence/show_commentmailing.html:19 +msgid "Excerpt" +msgstr "" + +#: templates/correspondence/show_commentmailing.html:22 +#, fuzzy +msgid "Reply ID" +msgstr "Répondre" + +#: templates/correspondence/show_commentmailing.html:26 +msgid "" +"\n" +"\t\t To reply to these comments, please print the\n" +"\t\t following “reply ID” at the top of\n" +"\t\t the page: {{\n" +"\t\t post.reply_code.code }}. This will allow us\n" +"\t\t to notify the comment authors that you have\n" +"\t\t written a response. Please only include one\n" +"\t\t reply ID at a time – to reply to more than\n" +"\t\t one set of comments, use a separate page.\n" +"\t\t " +msgstr "" + +#: templates/feeds/_all.html:1 +#, fuzzy +msgid "All posts" +msgstr "Mes articles" + +#: templates/feeds/_author.html:1 templates/feeds/_subscriptions.html:6 +#: templates/notification/notice_settings.html:53 +#, fuzzy +msgid "Posts by" +msgstr "Articles par categorie" + +#: templates/feeds/_comments.html:1 templates/feeds/_subscriptions.html:8 +#, fuzzy +msgid "Comments on" +msgstr "Commentaires" + +#: templates/feeds/_org.html:1 +#, fuzzy +msgid "Recent posts from" +msgstr "Articles récents" + +#: templates/feeds/_subscriptions.html:3 +#, fuzzy +msgid "Subscribe" +msgstr "Retranscris" + +#: templates/feeds/_subscriptions.html:4 +msgid "Get notifications when new letters or replies are posted!" +msgstr "" + +#: templates/feeds/_subscriptions.html:7 +#: templates/notification/notice_settings.html:59 +#, fuzzy +msgid "Posts from" +msgstr "Publié sur" + +#: templates/feeds/_subscriptions.html:9 +#, fuzzy +msgid "Posts tagged with" +msgstr "Articles ayant un tag" + +#: templates/feeds/_subscriptions.html:19 +#: templates/feeds/_subscriptions.html:32 +#: templates/feeds/_subscriptions.html:47 +#: templates/feeds/_subscriptions.html:61 +#: templates/feeds/_subscriptions.html:74 +msgid "email me" +msgstr "" + +#: templates/feeds/_subscriptions.html:80 +#, python-format +msgid "" +"\n" +"\t\tAll %(site_name)s posts:\n" +"\t\t" +msgstr "" + +#: templates/feeds/_tag.html:1 +#, fuzzy +msgid "posts" +msgstr "Mes articles" + +#: templates/moderation/_dashboard.html:4 +msgid "backend" +msgstr "" + +#: templates/moderation/_dashboard.html:8 +msgid "Unfinished" +msgstr "" + +#: templates/moderation/_dashboard.html:9 +msgid "Finished" +msgstr "" + +#: templates/moderation/_dashboard.html:11 +msgid "Scans" +msgstr "" + +#: templates/moderation/_dashboard.html:17 +msgid "Needs attention" +msgstr "" + +#: templates/moderation/_dashboard.html:21 +#, fuzzy +msgid "Documents" +msgstr "Commentaires" + +#: templates/moderation/_dashboard.html:27 +msgid "Open Tickets" +msgstr "" + +#: templates/moderation/_dashboard.html:33 +msgid "Outgoing Mail" +msgstr "" + +#: templates/moderation/_dashboard.html:43 +msgid "Enqueued" +msgstr "" + +#: templates/moderation/_dashboard.html:44 +msgid "Needed" +msgstr "" + +#: templates/moderation/_notes.html:4 +msgid "Add Note" +msgstr "" + +#: templates/moderation/_notes.html:22 +msgid "Needs further attention?" +msgstr "" + +#: templates/moderation/_notes.html:29 +msgid "Add Note/Ticket" +msgstr "" + +#: templates/moderation/_notes.html:36 +msgid "NEEDS ATTENTION" +msgstr "" + +#: templates/moderation/_notes.html:48 +msgid "Assigned to" +msgstr "" + +#: templates/moderation/_notes.html:57 +#, fuzzy +msgid "Edit note" +msgstr "Edition de l'article" + +#: templates/moderation/_notes.html:58 +#, fuzzy +msgid "Delete note" +msgstr "Supprimer l'article" + +#: templates/moderation/_notes.html:60 +msgid "Mark resolved" +msgstr "" + +#: templates/moderation/_scans.html:4 +msgid "Scans needing attention" +msgstr "" + +#: templates/moderation/_scans.html:7 +msgid "Documents needing attention" +msgstr "" + +#: templates/moderation/_scans.html:14 templates/moderation/_scans.html:49 +#, fuzzy +msgid "Delete scan" +msgstr "Supprimer l'article" + +#: templates/moderation/_scans.html:18 +msgid "started editing" +msgstr "" + +#: templates/moderation/_scans.html:38 +msgid "Warning" +msgstr "" + +#: templates/moderation/_scans.html:38 +msgid "" +"started editing this scan <%= btb.englishDateInterval(created, now) %> ago. " +"You might hold up a bit so that your changes don't conflict." +msgstr "" + +#: templates/moderation/_scans.html:44 +msgid "Split Scan" +msgstr "" + +#: templates/moderation/_scans.html:45 +#, fuzzy +msgid "Original (pdf)" +msgstr "Original (PDF)" + +#: templates/moderation/_scans.html:52 +#, fuzzy +msgid "Replace scan" +msgstr "Réponses" + +#: templates/moderation/_scans.html:55 +msgid "Re-parse scan" +msgstr "" + +#: templates/moderation/_scans.html:58 +msgid "Merge scans" +msgstr "" + +#: templates/moderation/_scans.html:88 +msgid "Code" +msgstr "" + +#: templates/moderation/_scans.html:89 +msgid "Scan Code" +msgstr "" + +#: templates/moderation/_scans.html:95 +#, fuzzy +msgid "Author" +msgstr "Auteurs" + +#: templates/moderation/_scans.html:111 +#, fuzzy +msgid "Post" +msgstr "Publié sur" + +#: templates/moderation/_scans.html:111 +msgid "Photo" +msgstr "" + +#: templates/moderation/_scans.html:114 +msgid "Edit documents" +msgstr "" + +#: templates/moderation/base.html:2 +msgid "active" +msgstr "" + +#: templates/moderation/manage_tasks.html:2 +msgid "Manage tasks" +msgstr "" + +#: templates/moderation/manage_tasks.html:35 +msgid "Tasks" +msgstr "" + +#: templates/moderation/manage_tasks.html:38 +msgid "Restrict to" +msgstr "" + +#: templates/moderation/manage_tasks.html:38 +msgid "PENDING" +msgstr "" + +#: templates/moderation/manage_tasks.html:38 +msgid "SUCCESS" +msgstr "" + +#: templates/moderation/manage_tasks.html:38 +msgid "FAILURE" +msgstr "" + +#: templates/moderation/manage_tasks.html:42 +msgid "Link" +msgstr "" + +#: templates/moderation/manage_tasks.html:45 +msgid "Result" +msgstr "" + +#: templates/moderation/manage_tasks.html:46 +#: templates/moderation/manage_tasks.html:58 +msgid "Traceback" +msgstr "" + +#: templates/moderation/manage_tasks.html:50 +#, fuzzy +msgid "waiting page for task" +msgstr "écrivant pour" + +#: templates/moderation/manage_tasks.html:50 +msgid "link" +msgstr "" + +#: templates/moderation/stats.html:7 +#, fuzzy +msgid "Stats" +msgstr "Status" + +#: templates/moderation/stats.html:10 +msgid "Users" +msgstr "" + +#: templates/moderation/stats.html:12 +msgid "Current breakdown" +msgstr "" + +#: templates/moderation/stats.html:20 +msgid "New users per week" +msgstr "" + +#: templates/moderation/stats.html:30 templates/moderation/stats.html.py:40 +#, fuzzy +msgid "Posts" +msgstr "Mes articles" + +#: templates/moderation/stats.html:32 templates/moderation/stats.html.py:78 +msgid "Totals" +msgstr "" + +#: templates/moderation/stats.html:36 +msgid "Total" +msgstr "" + +#: templates/moderation/stats.html:45 +#, fuzzy +msgid "Profiles" +msgstr "Profile" + +#: templates/moderation/stats.html:53 +msgid "Timeline (by week)" +msgstr "" + +#: templates/moderation/stats.html:61 +msgid "Impact: Posts" +msgstr "" + +#: templates/moderation/stats.html:68 +msgid "Impact: Pages" +msgstr "" + +#: templates/moderation/stats.html:80 +#, fuzzy +msgid "Comments published" +msgstr "Ne peux pas être publié" + +#: templates/moderation/stats.html:82 +msgid "Comments posted per week" +msgstr "" + +#: templates/moderation/stats.html:85 +msgid "This graph shows the number of new comments posted per week." +msgstr "" + +#: templates/moderation/stats.html:88 +#, fuzzy +msgid "Commenter Impact" +msgstr "Commentaire" + +#: templates/notification/notice_settings.html:3 +msgid "Notification preferences" +msgstr "" + +#: templates/notification/notice_settings.html:8 +msgid "Communication preferences" +msgstr "" + +#: templates/notification/notice_settings.html:10 +#, fuzzy +msgid "Your email address" +msgstr "Adresse email" + +#: templates/notification/notice_settings.html:13 +msgid "" +"You have no email address in your profile, so will receive no email " +"notifications." +msgstr "" + +#: templates/notification/notice_settings.html:14 +#, fuzzy +msgid "Add an email address" +msgstr "Adresse email" + +#: templates/notification/notice_settings.html:16 +msgid "Send email notifications for:" +msgstr "" + +#: templates/notification/notice_settings.html:29 +#: templates/notification/notice_settings.html:64 +msgid "Save preferences" +msgstr "" + +#: templates/notification/notice_settings.html:31 +#, python-format +msgid "" +"\n" +"\t To ensure our emails are not delivered to your spam folder, please add " +"%(from_email)s to your address " +"book.\n" +"\t " +msgstr "" -#: templates/correspondence/base_letter_list.html:7 -#: templates/correspondence/pending.html:3 -msgid "Manage correspondence" -msgstr "Gérer la correspondance" +#: templates/notification/notice_settings.html:36 +#, fuzzy +msgid "Subscriptions" +msgstr "Retranscription" -#: templates/correspondence/base_letter_list.html:18 -msgid "Changed letter sent status." -msgstr "Status d'envoi de la lettre modifié" +#: templates/notification/notice_settings.html:37 +msgid "" +"Notifications appear on the site, and according to the preferences above." +msgstr "" -#: templates/correspondence/sent.html:4 templates/correspondence/sent.html:8 -msgid "Sent correspondence" -msgstr "Correspondance envoyée" +#: templates/notification/notice_settings.html:47 +#, fuzzy +msgid "Replies to" +msgstr "Réponses" + +#: templates/notification/notice_settings.html:59 +#: templates/subscriptions/subscribe_to.html:12 +#, fuzzy +msgid "authors" +msgstr "Auteurs" + +#: templates/notification/notice_settings.html:67 +msgid "You have no subscriptions." +msgstr "" + +#: templates/notification/notices.html:4 +#: templates/notification/notices.html:11 +msgid "Notifications" +msgstr "" + +#: templates/notification/notices.html:10 +msgid "Subscriptions and communication preferences" +msgstr "" + +#: templates/notification/notices.html:13 +msgid "Mark all as read" +msgstr "" + +#: templates/notification/notices.html:17 +msgid "Message" +msgstr "" + +#: templates/notification/notices.html:36 +msgid "Delete all messages" +msgstr "" + +#: templates/notification/notices.html:39 +msgid "No notifications." +msgstr "" + +#: templates/notification/new_post/notice.html:1 +#: templates/notification/new_reply/notice.html:1 +msgid "from" +msgstr "" + +#: templates/notification/new_reply/notice.html:1 +#, fuzzy +msgid "to a post you're following" +msgstr "nouvelle réponse à un article que vous suivez" + +#: templates/profiles/confirm_delete_scan.html:2 +#: templates/profiles/profile_edit.html:37 +msgid "Remove scan" +msgstr "" + +#: templates/profiles/confirm_delete_scan.html:4 +msgid "Are you sure you want to remove your profile scan?" +msgstr "" + +#: templates/profiles/confirm_delete_scan.html:6 +#, fuzzy +msgid "Delete" +msgstr "Supprimer l'article" + +#: templates/profiles/confirm_delete_self.html:2 +#: templates/profiles/profile_edit.html:48 +#, fuzzy +msgid "Delete account" +msgstr "Supprimer l'article" + +#: templates/profiles/confirm_delete_self.html:4 +msgid "Delete account permanently?" +msgstr "" + +#: templates/profiles/confirm_delete_self.html:6 +msgid "" +"\n" +"Are you sure you want to delete your account? This cannot be undone. You " +"will\n" +"no longer be able to log in and all information about your profile will be\n" +"removed.\n" +msgstr "" + +#: templates/profiles/confirm_delete_self.html:19 +#, fuzzy +msgid "Delete comments" +msgstr "Commentaires récents" + +#: templates/profiles/confirm_delete_self.html:22 +msgid "" +"\n" +" Note: Once things are on the Internet, it's nearly impossible for " +"them\n" +" to be removed completely. Search engines and other sites may " +"retain\n" +" copies of the comments, and they may have been printed and mailed " +"to\n" +" the authors of blog posts. However, we will make a good faith " +"effort\n" +" to remove your information.\n" +"\t" +msgstr "" + +#: templates/profiles/confirm_delete_self.html:31 +msgid "" +"\n" +" Once you delete your account, you will be unable to later delete\n" +" comments if you don't delete them now. Either way, your profile\n" +" information will no longer be associated with the comments.\n" +"\t" +msgstr "" + +#: templates/profiles/confirm_delete_self.html:38 +msgid "" +"\n" +" If you have any questions or concerns about this, please contact\n" +" info@betweenthebars.org.\n" +"\t" +msgstr "" + +#: templates/profiles/confirm_delete_self.html:45 +msgid "Delete account permanently" +msgstr "" + +#: templates/profiles/groups_list.html:15 +msgid "Partners" +msgstr "" + +#: templates/profiles/groups_list.html:31 +#, python-format +msgid "" +"\n" +"\t\t %(site.name)s partners program\n" +"\t\t" +msgstr "" + +#: templates/profiles/groups_list.html:36 +#, python-format +msgid "" +"\n" +"\t\tDo you know someone in prison who would like to blog? %(site.name)s\n" +"\t\tis growing through the support of volunteers around the world\n" +"\t\twho help to facilitate blogging. All you need to get started is\n" +"\t\taccess to a scanner so that you can scan letters you receive, and\n" +"\t\tto be willing to make a commitment to the people you'll be\n" +"\t\trepresenting.\n" +"\t\t" +msgstr "" + +#: templates/profiles/groups_list.html:47 +#, python-format +msgid "" +"\n" +"\t\tFor organizations with multiple writers, %(site.name)s can set\n" +"\t\tup a partner page to draw traffic and attention to your writers,\n" +"\t\tand represent your organization and its mission.\n" +"\t\t" +msgstr "" + +#: templates/profiles/groups_list.html:55 +msgid "" +"\n" +"\t\tIf you are an individual or organization that is interested in\n" +"\t\tmaking a commitment to help people in prison express themselves,\n" +"\t\tplease contact us at info@betweenthebars.org.\n" +"\t\t" +msgstr "" + +#: templates/profiles/groups_list.html:68 +#, python-format +msgid "" +"\n" +"\t\t Independent writers, supported by volunteers and staff for " +"%(site.name)s:\n" +"\t\t " +msgstr "" + +#: templates/profiles/groups_list.html:79 +#, python-format +msgid "" +"\n" +"\t\t\t %(profile.authored_posts_count)s posts;\n" +"\t\t\t latest %(profile.latest_post|naturalday)s.\n" +"\t\t\t " +msgstr "" + +#: templates/profiles/groups_list.html:94 +#, python-format +msgid "" +"\n" +"\t\t All %(chosen_org.name)s posts\n" +"\t\t " +msgstr "" #: templates/profiles/profile_detail.html:6 +#: templates/profiles/profile_detail.html:12 #, python-format msgid "%(profile)s's profile" msgstr "Profil de %(profile)s" -#: templates/profiles/profile_detail.html:39 +#: templates/profiles/profile_detail.html:19 +#, fuzzy +msgid "Edit settings" +msgstr "Edition de l'article" + +#: templates/profiles/profile_detail.html:51 msgid "Scanned profile" msgstr "Profil scanné" -#: templates/profiles/profile_edit.html:23 +#: templates/profiles/profile_detail.html:73 +#, python-format +msgid "" +"\n" +"\t Read more from %(profile)s's blog\n" +"\t " +msgstr "" + +#: templates/profiles/profile_detail.html:86 +#, fuzzy +msgid "No comments" +msgstr "Plus de commentaires" + +#: templates/profiles/profile_detail.html:89 +#, fuzzy +msgid "Transcriptions" +msgstr "Retranscription" + +#: templates/profiles/profile_detail.html:94 +#, fuzzy +msgid "No transcriptions" +msgstr "Ajouter une transcription" + +#: templates/profiles/profile_edit.html:6 +#, python-format +msgid "" +"\n" +" Edit profile for %(profile.display_name)s\n" +" " +msgstr "" + +#: templates/profiles/profile_edit.html:14 +#, python-format +msgid "" +"\n" +" Profile for %(profile.user.profile.display_name)s\n" +" " +msgstr "" + +#: templates/profiles/profile_edit.html:19 +#, fuzzy +msgid "Change password" +msgstr "Modifier le mot de passe" + +#: templates/profiles/profile_edit.html:20 +#, fuzzy +msgid "Email subscriptions" +msgstr "email optionnel." + +#: templates/profiles/profile_edit.html:31 msgid "Save details" msgstr "Enregistrer les details" +#: templates/profiles/profile_edit.html:36 +msgid "Current profile page" +msgstr "" + +#: templates/profiles/profile_edit.html:39 +#, fuzzy +msgid "Profile for" +msgstr "Profile" + #: templates/registration/activation_complete.html:7 msgid "Your registration is now complete." msgstr "Votre enregistrement est effectué." @@ -726,15 +3064,7 @@ msgstr "Oublié votre mot de passe ?" msgid "Register" msgstr "S'enregistrer" -#: templates/registration/password_change_form.html:7 -#, python-format -msgid "" -"\n" -"

%%{ trans \"For security purposes, enter your old password first.\" %%}\n" -msgstr "" - -#: templates/registration/password_change_form.html:14 +#: templates/registration/password_change_form.html:12 msgid "Change Password" msgstr "Modifier le mot de passe" @@ -745,7 +3075,8 @@ msgstr "Remise à zéro effectuée" #: templates/registration/password_reset_complete.html:10 msgid "Your password has been set. You may go ahead and log in now." -msgstr "Votre mot de passe à été enregistré. Vous pouvez vous authentifé à présent." +msgstr "" +"Votre mot de passe à été enregistré. Vous pouvez vous authentifé à présent." #: templates/registration/password_reset_complete.html:12 msgid "Log in" @@ -764,7 +3095,9 @@ msgstr "Renseigné un nouveau mot de passe" msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." -msgstr "Merci d'entrer votre nouveau mot de passe deux fois pour que nous puissions vérifer que vous l'avez tapé correctement." +msgstr "" +"Merci d'entrer votre nouveau mot de passe deux fois pour que nous puissions " +"vérifer que vous l'avez tapé correctement." #: templates/registration/password_reset_confirm.html:16 msgid "New password:" @@ -786,7 +3119,10 @@ msgstr "Remise à zéro du mot de passe a échoué" msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." -msgstr "Le lien de remise à zéro du mot de passe est invalide, il est possible qu'il ait déjà été utilisé. Merci de refaire une demande de remise à zéro du mot de passe." +msgstr "" +"Le lien de remise à zéro du mot de passe est invalide, il est possible qu'il " +"ait déjà été utilisé. Merci de refaire une demande de remise à zéro du mot " +"de passe." #: templates/registration/password_reset_confirm.html:27 msgid "Request password reset" @@ -804,7 +3140,9 @@ msgstr "E-mail de remise à zero du mot de passe envoyé" msgid "" "We've e-mailed you instructions for setting your password to the e-mail " "address you submitted. You should receive it soon." -msgstr "Un email vous a été envoyé avec des instructions pour faire une remise à zéro de votre mot de passe" +msgstr "" +"Un email vous a été envoyé avec des instructions pour faire une remise à " +"zéro de votre mot de passe" #: templates/registration/password_reset_form.html:4 msgid "password reset" @@ -814,7 +3152,9 @@ msgstr "remise à zéro du mot de passe" msgid "" "Forgotten your password? Enter your e-mail address below, and we'll e-mail " "instructions for setting a new one." -msgstr "Vous avez oublié votre mot de passe ? Entrez votre addresse email ci-dessous et nous vous enverons des instructions pour en entrer un nouveau." +msgstr "" +"Vous avez oublié votre mot de passe ? Entrez votre addresse email ci-dessous " +"et nous vous enverons des instructions pour en entrer un nouveau." #: templates/registration/password_reset_form.html:15 msgid "Reset my password" @@ -824,15 +3164,6 @@ msgstr "Remise à zéro de mot de passe" msgid "Registration temporarily closed" msgstr "Création de compte temporairement fermée" -#: templates/registration/registration_closed.html:6 -#, python-format -msgid "" -"\n" -"%%{ trans \"Registration is temporarily disabled while the site is " -"undergoing maintenance.\" %%}\n" -"%%{ trans \"We apologize for the inconvenience.\" %%}\n" -msgstr "" - #: templates/registration/registration_complete.html:6 msgid "Confirmation email sent" msgstr "Email de confirmation envoyé" @@ -856,7 +3187,10 @@ msgid "" "Privacy Policy.\" %%}\n" msgstr "" "\n" -"Les utilisateurs enregistrés peuvent laisser des commentaires et contribuer des retranscriptions des articles. En créant un compte sur la plateforme vous êtes d'accord avec les conditions d'utilisation et la politique vie privée.\n" +"Les utilisateurs enregistrés peuvent laisser des commentaires et contribuer " +"des retranscriptions des articles. En créant un compte sur la plateforme " +"vous êtes d'accord avec les conditions d'utilisation " +"et la politique vie privée.\n" #: templates/registration/welcome.html:3 templates/registration/welcome.html:6 msgid "Welcome" @@ -871,7 +3205,9 @@ msgid "" "edit your profile.\n" msgstr "" "\n" -"Enregistrement effectué. Vous pouvez à présenter laisser des commentaires, retranscrire des articles et editer votre profil.\n" +"Enregistrement effectué. Vous pouvez à présenter laisser des commentaires, " +"retranscrire des articles et editer votre profil.\n" #: templates/registration/welcome.html:21 #, python-format @@ -882,12 +3218,128 @@ msgid "" "for comments and transcriptions.\n" msgstr "" "\n" -"Si vous n'avez pas encore lu le guide de la communauté qui explique la démarche pour les commentaires et les retranscriptions.\n" +"Si vous n'avez pas encore lu le guide de " +"la communauté qui explique la démarche pour les commentaires et les " +"retranscriptions.\n" + +#: templates/scanning/_column_diff.html:5 +#: templates/scanning/_column_diff.html:7 +#: templates/scanning/revision_list.html:25 +#, fuzzy +msgid "Revision" +msgstr "révisions" + +#: templates/scanning/after_transcribe_comment.html:3 +msgid "Leave a note" +msgstr "" + +#: templates/scanning/after_transcribe_comment.html:12 +msgid "No thanks, skip this" +msgstr "" + +#: templates/scanning/delete.html:4 +msgid "Really delete scan?" +msgstr "" + +#: templates/scanning/delete.html:5 +msgid "" +"Are you sure you want to delete this scan? The following documents and any " +"comments they have will also be deleted." +msgstr "" + +#: templates/scanning/delete.html:7 +msgid "Delete (no undo)" +msgstr "" + +#: templates/scanning/delete.html:11 +msgid "pages" +msgstr "" + +#: templates/scanning/delete.html:11 +#, fuzzy +msgid "comments" +msgstr "Commentaires" + +#: templates/scanning/delete.html:14 +#, fuzzy +msgid "Scan pages" +msgstr "Page scannée" + +#: templates/scanning/flag.html:4 +#, fuzzy +msgid "Flag content" +msgstr "Signaler ce contenu" + +#: templates/scanning/flag.html:5 +msgid "" +"A flag lets moderators now that something is not right about a particular " +"post, profile, or comment. Please help us by flagging any posts that seem " +"to be against our guidelines, or have " +"been improperly edited (for example, pages not rotated correctly)." +msgstr "" + +#: templates/scanning/flag.html:12 +msgid "Notify moderators" +msgstr "" + +#: templates/scanning/merge.html:5 +msgid "Merge Scan" +msgstr "" + +#: templates/scanning/merge.html:6 +msgid "" +"Choose a PDF file to merge (add to the bottom of) this scan's PDF. Use this " +"if, for example, someone adds an additional page to a profile." +msgstr "" + +#: templates/scanning/reimport.html:4 templates/scanning/reimport.html.py:7 +msgid "Reimport scan" +msgstr "" + +#: templates/scanning/reimport.html:5 +msgid "" +"If processing of a scan failed for whatever reason, sometimes reimporting it " +"will fix garbled or missing images. This will make any documents associated " +"with this scan unavailable until the import is finished." +msgstr "" + +#: templates/scanning/replace.html:3 templates/scanning/upload.html:4 +#, fuzzy +msgid "Upload scans" +msgstr "Envoi de fichiers" + +#: templates/scanning/replace.html:5 +msgid "Replace Scan" +msgstr "" + +#: templates/scanning/replace.html:6 +msgid "Choose a PDF file to replace this scan's with." +msgstr "" #: templates/scanning/revision_list.html:10 msgid "Transcription revisions" msgstr "Révisions de la retranscription" +#: templates/scanning/revision_list.html:13 +#, fuzzy +msgid "edit transcription" +msgstr "Ajouter une transcription" + +#: templates/scanning/revision_list.html:26 +#, fuzzy +msgid "Compare" +msgstr "Écrire" + +#: templates/scanning/revision_list.html:27 +#, fuzzy +msgid "Editor" +msgstr "Éditer" + +#: templates/scanning/revision_list.html:56 +#, fuzzy +msgid "No transcription yet. Add one!" +msgstr "Editeur de retranscription" + #: templates/scanning/transcription_edit.html:85 msgid "Transcription editor" msgstr "Editeur de retranscription" @@ -908,5 +3360,69 @@ msgstr "Arranger verticalement" msgid "Transcription:" msgstr "Retranscription :" -msgid "is a weblog platform for people in prison, through which the 1% of Americans who are in prison can tell their stories. Leave a comment – we'll pass it on." -msgstr "est une plateforme de blogs pour personnes incarcérées. Laissez leur un message, nous leur envoyons par courrier postal." +#: templates/scanning/upload.html:7 +#, fuzzy +msgid "Upload Scans" +msgstr "Envoi de fichiers" + +#: templates/scanning/upload.html:8 +msgid "Upload individual PDF files, or zip files containing multiple PDFs." +msgstr "" + +#: templates/subscriptions/subscribe_to.html:3 +#: templates/subscriptions/subscribe_to.html:7 +#, fuzzy +msgid "Add subscription" +msgstr "Ajouter une transcription" + +#: templates/subscriptions/subscribe_to.html:8 +#, fuzzy +msgid "Add a subscription to" +msgstr "Ajouter une transcription" + +#: templates/subscriptions/subscribe_to.html:9 +#, fuzzy +msgid "posts tagged" +msgstr "Articles ayant un tag" + +#: templates/subscriptions/subscribe_to.html:10 +#, fuzzy +msgid "posts by" +msgstr "Pas encore d'articles." + +#: templates/subscriptions/subscribe_to.html:11 +#, fuzzy +msgid "comments on" +msgstr "Tous les commentaires à propos de %s" + +#: templates/subscriptions/subscribe_to.html:12 +msgid "posts from" +msgstr "" + +#: templates/subscriptions/subscribe_to.html:13 +msgid "Sign me up!" +msgstr "" + +#: templates/subscriptions/subscribe_to.html:14 +#, fuzzy +msgid "Subscription settings" +msgstr "Révisions de la retranscription" + +#: templates/subscriptions/subscribe_to.html:18 +#, python-format +msgid "" +"\n" +"Note: you have no email address set in your profile, so you will only see " +"notifications by logging into the site. If you'd like to receive email " +"notifications, please add an " +"email address in your profile.\n" +msgstr "" + +#~ msgid "filed under" +#~ msgstr "enregistré sous" + +#~ msgid "More" +#~ msgstr "Plus" + +#~ msgid "More posts" +#~ msgstr "Plus d'articles" From 4f13d55ca064c406a421941ab4323b1509639699 Mon Sep 17 00:00:00 2001 From: Arthur Lutz Date: Mon, 6 Aug 2012 08:46:50 +0200 Subject: [PATCH 23/53] untranslated blocks --- scanblog/templates/moderation/stats.html | 40 +++++++++++++++++------- 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/scanblog/templates/moderation/stats.html b/scanblog/templates/moderation/stats.html index a36dcc3..72b1d96 100644 --- a/scanblog/templates/moderation/stats.html +++ b/scanblog/templates/moderation/stats.html @@ -12,17 +12,21 @@

{% trans "Users" %}

{% trans "Current breakdown" %}

- {% trans "A treemap showing various user statuses, with the number of users + {% blocktrans %} + A treemap showing various user statuses, with the number of users in each group in parentheses. Click to zoom in, right-click to zoom - out." %} + out. + {% endblocktrans %}

{% trans "New users per week" %}

- {% trans "The number of new users that are added per week. Spikes in comment + {% blocktrans %} + The number of new users that are added per week. Spikes in comment count probably indicate spam bot signups. We have been inviting and - enrolling fewer writers since June when we reached capacity." %} + enrolling fewer writers since June when we reached capacity. + {% endblocktrans %}

@@ -53,23 +57,29 @@

{% trans "Totals" %}

{% trans "Timeline (by week)" %}

- {% trans "The timeline shows the number of requests, posts, and profiles + {% blocktrans %} + The timeline shows the number of requests, posts, and profiles received in total per week. We only started tracking requests on Oct - 1."%} + 1. + {% endblocktrans %}

{% trans "Impact: Posts" %}

- {% trans "This graph shows the number of posts ordered by author, to - demonstrate the portion of all posts that top contributors make." %} + {% blocktrans %} + This graph shows the number of posts ordered by author, to + demonstrate the portion of all posts that top contributors make. + {% endblocktrans %}

{% trans "Impact: Pages" %}

- {% trans "This graph shows the contribution by page count. Some authors - post a lot of pages, where others send short form pieces." %} + {% blocktrans %} + This graph shows the contribution by page count. Some authors + post a lot of pages, where others send short form pieces. + {% endblocktrans %}
@@ -88,8 +98,10 @@

{% trans "Comments posted per week" %}

{% trans "Commenter Impact" %}

- {% trans "This graph shows the number of comments posted by particular users. - Around 1/4 of the comments posted are from the top 5 contributors." %} + {% blocktrans %} + This graph shows the number of comments posted by particular users. + Around 1/4 of the comments posted are from the top 5 contributors. + {% endblocktrans %}
@@ -98,17 +110,21 @@

Letters

Sent per week

+ {% blocktrans %} This shows the breakdown of letters that we send per week. Over the summer of 2011, we had a spike in signup requests (and hence waitlist notifications) due to being advertised in a prison newsletter. + {% endblocktrans %}

Impact

+ {% blocktrans %} This shows the breakdown of recipients of letters we send, showing which users receive the largest portion of mail. + {% endblocktrans %}
From d9cf13b093ff663b8147fa7c6674b4bc7053078a Mon Sep 17 00:00:00 2001 From: Arthur Lutz Date: Mon, 6 Aug 2012 08:49:47 +0200 Subject: [PATCH 24/53] removing hard coded email adress and using the default from adress stored in db --- scanblog/templates/blogs/edit_post.html | 8 +++++--- .../correspondence/mass_mailing_spreadsheet.html | 2 +- scanblog/templates/profiles/confirm_delete_self.html | 2 +- scanblog/templates/profiles/groups_list.html | 2 +- scanblog/templates/site_base.html | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/scanblog/templates/blogs/edit_post.html b/scanblog/templates/blogs/edit_post.html index 3f640e8..60aba86 100644 --- a/scanblog/templates/blogs/edit_post.html +++ b/scanblog/templates/blogs/edit_post.html @@ -19,11 +19,13 @@

{% if post.scan_id %}

- {% trans "Sorry: we're still working on the feature to allow you to edit scans + {% blocktrans %} + Sorry: we're still working on the feature to allow you to edit scans that were uploaded while you were incarcerated. We're not ready yet! In the mean time, don't hesitate to write us at - info@betweenthebars.org - and we an make any changes to the posts if you'd like." %} + {{ site_email }} + and we an make any changes to the posts if you'd like. + {% endblocktrans %}

{% trans "If you'd like to remove the post, click “Delete post“ below." %} diff --git a/scanblog/templates/correspondence/mass_mailing_spreadsheet.html b/scanblog/templates/correspondence/mass_mailing_spreadsheet.html index f75bf03..4a6047a 100644 --- a/scanblog/templates/correspondence/mass_mailing_spreadsheet.html +++ b/scanblog/templates/correspondence/mass_mailing_spreadsheet.html @@ -1,5 +1,5 @@ {% extends "moderation/base.html" %} -{% block title %}{% trans "Mass mailing spreadsheet" %}{% endblock %} +{% block title %}{% trans "Mass Mailing spreadsheet" %}{% endblock %} {% block body %}

{% trans "Mass Mailing Spreadsheet" %}

diff --git a/scanblog/templates/profiles/confirm_delete_self.html b/scanblog/templates/profiles/confirm_delete_self.html index ac4a9f7..1771dc5 100644 --- a/scanblog/templates/profiles/confirm_delete_self.html +++ b/scanblog/templates/profiles/confirm_delete_self.html @@ -37,7 +37,7 @@

{% trans "Delete account permanently?" %}

{% blocktrans %} If you have any questions or concerns about this, please contact - info@betweenthebars.org. + {{ site_email }}. {% endblocktrans %}

diff --git a/scanblog/templates/profiles/groups_list.html b/scanblog/templates/profiles/groups_list.html index 8a68c0c..cae99a1 100644 --- a/scanblog/templates/profiles/groups_list.html +++ b/scanblog/templates/profiles/groups_list.html @@ -56,7 +56,7 @@

If you are an individual or organization that is interested in making a commitment to help people in prison express themselves, please contact us at info@betweenthebars.org. + href='mailto:{{ site_email }}'>{{ site_email }}. {% endblocktrans %}

{% else %} diff --git a/scanblog/templates/site_base.html b/scanblog/templates/site_base.html index 5c14251..254947e 100644 --- a/scanblog/templates/site_base.html +++ b/scanblog/templates/site_base.html @@ -119,7 +119,7 @@ {% block footer %}

+

{% trans "Thanks!" %}

+

{% trans "Sign up received. Thanks for your interest!" %} {% endblock %} From a30db26b166efb72c6be08c6b22484c7ff2e3e73 Mon Sep 17 00:00:00 2001 From: Arthur Lutz Date: Thu, 22 May 2014 23:52:12 +0200 Subject: [PATCH 50/53] [i18n] django makemessages -l fr --- scanblog/locale/fr/LC_MESSAGES/django.po | 1083 +++++++++++++++++++--- 1 file changed, 971 insertions(+), 112 deletions(-) diff --git a/scanblog/locale/fr/LC_MESSAGES/django.po b/scanblog/locale/fr/LC_MESSAGES/django.po index 5d666cd..7316714 100644 --- a/scanblog/locale/fr/LC_MESSAGES/django.po +++ b/scanblog/locale/fr/LC_MESSAGES/django.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Between the Bars\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-09 10:36-0400\n" +"POT-Creation-Date: 2014-05-22 17:50-0400\n" "PO-Revision-Date: 2013-11-20 12:18+0000\n" "Last-Translator: arthur.lutz \n" "Language-Team: French (http://www.transifex.com/projects/p/btb/language/" @@ -299,8 +299,8 @@ msgstr "À propos" msgid "Moderation" msgstr "Modération" -#: templates/site_base.html:47 templates/scanning/merge.html:9 -#: templates/scanning/replace.html:9 templates/scanning/upload.html:11 +#: templates/site_base.html:47 templates/scanning/merge.html:10 +#: templates/scanning/replace.html:10 templates/scanning/upload.html:11 msgid "Upload" msgstr "Envoi de fichiers" @@ -318,11 +318,11 @@ msgid_plural "%(counter)s messages" msgstr[0] "" msgstr[1] "" -#: templates/site_base.html:71 +#: templates/site_base.html:71 templates/moderation/_users.html:209 msgid "Profile" msgstr "Profile" -#: templates/site_base.html:73 +#: templates/site_base.html:73 templates/moderation/_users.html:210 msgid "Admin" msgstr "Administration" @@ -1489,9 +1489,10 @@ msgid "Recent posts" msgstr "Articles récents" #: templates/blogs/_blog_cloud.html:15 +#: templates/btb/daily_spam_check_email.html:28 #: templates/correspondence/show_commentmailing.html:37 #: templates/moderation/_correspondence.html:372 -#: templates/moderation/stats.html:90 +#: templates/moderation/_users.html:243 templates/moderation/stats.html:91 msgid "Comments" msgstr "Commentaires" @@ -1525,6 +1526,7 @@ msgid "All posts by date" msgstr "Tous les articles par date" #: templates/blogs/_blog_cloud.html:99 +#: templates/btb/daily_spam_check_email.html:34 msgid "on" msgstr "le" @@ -1536,6 +1538,8 @@ msgstr "le" #: templates/blogs/author_post_list.html:14 #: templates/blogs/post_detail.html:34 #: templates/btb/admin-email-transcription-edited.txt:3 +#: templates/btb/daily_spam_check_email.html:36 +#: templates/btb/daily_spam_check_email.html:56 #: templates/notification/notice_settings.html:50 #: templates/notification/new_reply/full.txt:2 #: templates/subscriptions/subscribe_to.html:13 @@ -1550,7 +1554,8 @@ msgstr "Tous les commentaires" msgid "Authors with recent posts" msgstr "Auteurs ayant des articles récents" -#: templates/blogs/_blog_cloud.html:113 templates/profiles/groups_list.html:89 +#: templates/blogs/_blog_cloud.html:113 templates/moderation/_users.html:158 +#: templates/profiles/groups_list.html:89 msgid "profile" msgstr "profil" @@ -1591,6 +1596,7 @@ msgid "Scanned page" msgstr "Page scannée" #: templates/blogs/_post_pages.html:35 +#: templates/btb/daily_spam_check_email.html:57 msgid "uploaded" msgstr "télétransmis" @@ -1677,27 +1683,27 @@ msgstr "et le supprimer de ce site ?" msgid "This can't be undone." msgstr "Cette opération est irreversible." -#: templates/blogs/delete_post.html:13 templates/blogs/edit_post.html:65 +#: templates/blogs/delete_post.html:13 templates/blogs/edit_post.html:66 msgid "Delete post" msgstr "Supprimer l'article" #: templates/blogs/delete_post.html:17 -#: templates/comments/delete_comment.html:11 +#: templates/comments/delete_comment.html:12 #: templates/moderation/_correspondence.html:46 -#: templates/moderation/_notes.html:27 +#: templates/moderation/_notes.html:27 templates/moderation/_users.html:61 #: templates/scanning/transcription_edit.html:118 msgid "Cancel" msgstr "Annuler" -#: templates/blogs/edit_post.html:7 templates/blogs/edit_post.html.py:16 +#: templates/blogs/edit_post.html:8 templates/blogs/edit_post.html.py:17 msgid "Editing post" msgstr "Edition de l'article" -#: templates/blogs/edit_post.html:9 templates/blogs/edit_post.html.py:18 +#: templates/blogs/edit_post.html:10 templates/blogs/edit_post.html.py:19 msgid "Compose post" msgstr "Écrire un article" -#: templates/blogs/edit_post.html:23 +#: templates/blogs/edit_post.html:24 #, python-format msgid "" "\n" @@ -1709,23 +1715,23 @@ msgid "" "\t" msgstr "" -#: templates/blogs/edit_post.html:32 +#: templates/blogs/edit_post.html:33 msgid "" "If you'd like to remove the post, click “Delete post“ below." msgstr "" "Si vous souhaitez supprimer cet article, cliquez sur “Supprimer " "l'article“ ci-dessous." -#: templates/blogs/edit_post.html:39 templates/blogs/manage_posts.html:13 +#: templates/blogs/edit_post.html:40 templates/blogs/manage_posts.html:13 #: templates/btb/admin-unmanaged-post-notification.txt:15 msgid "Tags" msgstr "Tags" -#: templates/blogs/edit_post.html:41 +#: templates/blogs/edit_post.html:42 msgid "(optional) Comma separated list of categories" msgstr "(optionnel) Liste de catégories séparées par des virgules" -#: templates/blogs/edit_post.html:53 +#: templates/blogs/edit_post.html:54 msgid "Save post" msgstr "Enregistré l'article" @@ -1742,6 +1748,8 @@ msgid "Title" msgstr "Titre" #: templates/blogs/manage_posts.html:14 +#: templates/moderation/_documents.html:40 +#: templates/moderation/_users.html:326 #: templates/moderation/manage_tasks.html:46 msgid "Status" msgstr "Status" @@ -1758,12 +1766,12 @@ msgid "Draft" msgstr "Brouillon" #: templates/blogs/manage_posts.html:28 -#: templates/moderation/_dashboard.html:19 templates/moderation/stats.html:45 +#: templates/moderation/_dashboard.html:19 templates/moderation/stats.html:46 msgid "Ready to publish" msgstr "Prêt à la publication" #: templates/blogs/manage_posts.html:31 -#: templates/moderation/_dashboard.html:20 templates/moderation/stats.html:44 +#: templates/moderation/_dashboard.html:20 templates/moderation/stats.html:45 msgid "Published" msgstr "Publié" @@ -1907,6 +1915,7 @@ msgstr "Fonctions d'administation" #: templates/btb/admin-email-transcription-edited.txt:16 #: templates/btb/admin-unmanaged-post-notification.txt:6 #: templates/btb/admin-visitor-profile-notification.txt:7 +#: templates/moderation/_users.html:147 msgid "Edit user" msgstr "Éditer l'utilisateur" @@ -1957,6 +1966,141 @@ msgstr "Éditer l'utilisateur en tant qu'administrateur" msgid "A profile PDF was uploaded by user" msgstr "Un PDF de profil a été envoyé par l'utilisateur" +#: templates/btb/daily_spam_check_email.html:26 +#, fuzzy +msgid "BtB Comment/Transcription report" +msgstr "Editeur de retranscription" + +#: templates/btb/daily_spam_check_email.html:37 +#, fuzzy +msgid "remove" +msgstr "Supprimer" + +#: templates/btb/daily_spam_check_email.html:38 +msgid "spam" +msgstr "" + +#: templates/btb/daily_spam_check_email.html:48 +#: templates/moderation/_users.html:245 +msgid "Transcriptions" +msgstr "Retranscriptions" + +#: templates/btb/daily_spam_check_email.html:57 +#: templates/scanning/revision_list.html:14 +msgid "edit transcription" +msgstr "editer la retranscription" + +#: templates/btb/daily_spam_check_email.html:58 +#, fuzzy +msgid "view document" +msgstr "Voir le document" + +#: templates/btb/daily_spam_check_email.html:59 +msgid "full diff" +msgstr "" + +#: templates/btb/daily_spam_check_email.html:63 +#: templates/moderation/_notes.html:61 +msgid "By" +msgstr "Par" + +#: templates/btb/daily_spam_check_email.html:64 +#, fuzzy +msgid "edit user" +msgstr "Éditer l'utilisateur" + +#: templates/btb/daily_spam_check_email.html:65 +#, fuzzy +msgid "delete user" +msgstr "Supprimer l'utilisateur" + +#: templates/btb/org_status_email.html:32 +msgid "The State of the {{ org.name }} is" +msgstr "" + +#: templates/btb/org_status_email.html:34 +msgid "Distance from inbox zero:" +msgstr "" + +#: templates/btb/org_status_email.html:37 +msgid "CONGRATULATIONS! Is the PO Box empty too?" +msgstr "" + +#: templates/btb/org_status_email.html:42 +msgid "Type" +msgstr "" + +#: templates/btb/org_status_email.html:42 +msgid "TODO" +msgstr "" + +#: templates/btb/org_status_email.html:42 +msgid "Oldest" +msgstr "" + +#: templates/btb/org_status_email.html:42 +msgid "Last work" +msgstr "" + +#: templates/btb/org_status_email.html:45 +#, fuzzy +msgid "Tickets" +msgstr "Tickets ouverts" + +#: templates/btb/org_status_email.html:49 +#: templates/btb/org_status_email.html:65 +#: templates/btb/org_status_email.html:79 +#: templates/btb/org_status_email.html:92 +#: templates/btb/org_status_email.html:110 +msgid "OVERDUE" +msgstr "" + +#: templates/btb/org_status_email.html:53 +#: templates/btb/org_status_email.html:68 +#: templates/btb/org_status_email.html:82 +#: templates/btb/org_status_email.html:95 +#: templates/btb/org_status_email.html:115 +msgid "old" +msgstr "" + +#: templates/btb/org_status_email.html:57 +#: templates/btb/org_status_email.html:71 +#: templates/btb/org_status_email.html:85 +#: templates/btb/org_status_email.html:98 +#: templates/btb/org_status_email.html:120 +#: templates/scanning/_column_diff.html:6 +#: templates/scanning/_column_diff.html:8 +msgid "ago" +msgstr "il y a" + +#: templates/btb/org_status_email.html:61 +#: templates/correspondence/base.html:10 +#: templates/moderation/_pendingscans.html:39 +msgid "Pending" +msgstr "En attente" + +#: templates/btb/org_status_email.html:75 +msgid "Scan Splitting" +msgstr "" + +#: templates/btb/org_status_email.html:89 +#: templates/moderation/_dashboard.html:22 +msgid "Documents" +msgstr "Documents" + +#: templates/btb/org_status_email.html:102 templates/moderation/home.html:20 +#, fuzzy +msgid "Outgoing mail" +msgstr "Courrier sortant" + +#: templates/btb/org_status_email.html:131 +msgid "The collective noun-thing of the day is" +msgstr "" + +#: templates/btb/org_status_email.html:135 +msgid "When" +msgstr "" + #: templates/comments/_comment.html:11 #, fuzzy msgid "removed" @@ -2034,12 +2178,12 @@ msgstr "" msgid "Favorited by:" msgstr "" -#: templates/comments/delete_comment.html:4 -#: templates/comments/delete_comment.html:10 +#: templates/comments/delete_comment.html:5 +#: templates/comments/delete_comment.html:11 msgid "Delete reply" msgstr "Supprimer la réponse" -#: templates/comments/delete_comment.html:5 +#: templates/comments/delete_comment.html:6 msgid "Are you sure you want to delete this reply? There is no undo." msgstr "" "Êtes-vous sûr de vouloir supprimer cette réponse ? Cette opération est " @@ -2093,9 +2237,167 @@ msgstr "ou faites des changement" msgid "Preview" msgstr "Aperçu" -#: templates/correspondence/base.html:10 -msgid "Pending" -msgstr "En attente" +#: templates/comments/removal-email-body.txt:7 +#, fuzzy +msgid "The removed comment was:" +msgstr "Laisser des commentaires" + +#: templates/comments/removal-email-subject.txt:2 +#, fuzzy +msgid "Comment removed" +msgstr "Commentaires activés" + +#: templates/comments/remove_comment.html:4 +#, fuzzy +msgid "Remove comment" +msgstr "Laisser des commentaires" + +#: templates/comments/remove_comment.html:36 +#, fuzzy +msgid "Remove Comment" +msgstr "Commentaires récents" + +#: templates/comments/remove_comment.html:39 +#, fuzzy +msgid "This comment has been removed." +msgstr "Un commentaire a été posté à propos de " + +#: templates/comments/remove_comment.html:40 +msgid "Restore (unremove) this comment" +msgstr "" + +#: templates/comments/remove_comment.html:43 +#, python-format +msgid "" +"Remove the following comment by {{ comment.user.profile }}? (If " +"this is spam, use info@betweenthebars.org\n" +" if you don't understand how to fix this.\n" +" " +msgstr "" + +#: templates/comments/remove_comment.html:128 +msgid "The post author has already been notified; this field can't be changed:" +msgstr "" + +#: templates/comments/remove_comment.html:130 +msgid "" +"If blank, no message will be sent to post author. Format is raw LaTeX." +msgstr "" + +#: templates/comments/remove_comment.html:135 +msgid "Greetings," +msgstr "" + +#: templates/comments/remove_comment.html:145 +#: templates/correspondence/generic-postcard.txt:7 +#, fuzzy +msgid "Sincerely," +msgstr "Sincèrement" + +#: templates/comments/remove_comment.html:150 +msgid "Preview rendered letter" +msgstr "" + +#: templates/comments/remove_comment.html:154 +msgid "Remove comment and send notifications" +msgstr "" + +#: templates/comments/spam_can_comment.html:6 +#, fuzzy +msgid "Remove Spam" +msgstr "Supprimer scan" + +#: templates/comments/spam_can_comment.html:8 +#, python-format +msgid "" +"\n" +" Remove the following comment by %(comment.user.profile)s\n" +" as spam? (If this is a violation of guidelines or anything other\n" +" than spam, use this form instead)\n" +" " +msgstr "" + +#: templates/comments/spam_can_comment.html:26 +msgid "Is the user a spambot?" +msgstr "" + +#: templates/comments/spam_can_comment.html:27 +msgid "" +"If the user is a spambot, remove the whole user instead. This will delete " +"all of the following, including the above comment:" +msgstr "" + +#: templates/comments/spam_can_comment.html:29 +#, fuzzy +msgid "User:" +msgstr "Utilisateurs" + +#: templates/comments/spam_can_comment.html:42 +msgid "Delete user and all their content" +msgstr "" + +#: templates/comments/unremove_comment.html:5 +#, fuzzy +msgid "Unremove comment" +msgstr "Laisser des commentaires" + +#: templates/comments/unremove_comment.html:8 +#, fuzzy +msgid "Unremove Comment" +msgstr "Laisser des commentaires" + +#: templates/comments/unremove_comment.html:10 +msgid "" +"Restore the following comment, which was removed on {{ removal.date|date }}?" +msgstr "" + +#: templates/comments/unremove_comment.html:20 +#, fuzzy +msgid "Restore comment" +msgstr "Plus de commentaires" #: templates/correspondence/base.html:13 #: templates/correspondence/base_letter_list.html:49 @@ -2155,6 +2457,10 @@ msgstr "annuler" msgid "To" msgstr "À" +#: templates/correspondence/generic-postcard.txt:3 +msgid "Greeting," +msgstr "" + #: templates/correspondence/mass_mailing_spreadsheet.html:4 msgid "Mass Mailing spreadsheet" msgstr "" @@ -2449,8 +2755,24 @@ msgstr "" msgid "posts" msgstr "articles" -#: templates/moderation/_common.html:34 templates/moderation/_groups.html:190 -#: templates/moderation/_scans.html:120 +#: templates/moderation/_common.html:6 +#, fuzzy +msgid "Per page:" +msgstr "Toutes les pages" + +#: templates/moderation/_common.html:13 +#, fuzzy +msgid "Page:" +msgstr "Pages:" + +#: templates/moderation/_common.html:30 +msgid "-- click to add --" +msgstr "" + +#: templates/moderation/_common.html:34 +#: templates/moderation/_documents.html:27 +#: templates/moderation/_documents.html:132 +#: templates/moderation/_groups.html:190 templates/moderation/_scans.html:120 #: templates/scanning/transcription_edit.html:117 msgid "Save" msgstr "Enregistrer" @@ -2505,6 +2827,7 @@ msgid "Edit list" msgstr "Liste d'attente" #: templates/moderation/_correspondence.html:103 +#: templates/moderation/_users.html:317 msgid "Special mail handling" msgstr "" @@ -2581,10 +2904,6 @@ msgstr "Scans" msgid "Needs attention" msgstr "A besoin d'une intervention" -#: templates/moderation/_dashboard.html:22 -msgid "Documents" -msgstr "Documents" - #: templates/moderation/_dashboard.html:28 msgid "Open Tickets" msgstr "Tickets ouverts" @@ -2601,6 +2920,191 @@ msgstr "Dans la file d'attente" msgid "Needed" msgstr "Needed???" +#: templates/moderation/_documents.html:5 +#, fuzzy +msgid "Editing" +msgstr "Edition de l'article" + +#: templates/moderation/_documents.html:12 +#, fuzzy +msgid "Document" +msgstr "Documents" + +#: templates/moderation/_documents.html:14 +#, fuzzy +msgid "Really delete this document? There is no undo." +msgstr "" +"Êtes-vous sûr de vouloir supprimer cette réponse ? Cette opération est " +"irreversible." + +#: templates/moderation/_documents.html:15 +#, fuzzy +msgid "Delete document" +msgstr "Supprimer le commentaire" + +#: templates/moderation/_documents.html:35 +#, fuzzy +msgid "Correspondence for" +msgstr "Correspondance envoyée" + +#: templates/moderation/_documents.html:40 +#: templates/moderation/_documents.html:57 +#: templates/moderation/_documents.html:138 +#, fuzzy +msgid "Edit author" +msgstr "Editeur" + +#: templates/moderation/_documents.html:46 +msgid "Type:" +msgstr "" + +#: templates/moderation/_documents.html:52 +msgid "(error - no parent scan.)" +msgstr "" + +#: templates/moderation/_documents.html:56 +#, fuzzy +msgid "Author:" +msgstr "Auteurs" + +#: templates/moderation/_documents.html:63 +#, fuzzy +msgid "Title:" +msgstr "Titre" + +#: templates/moderation/_documents.html:67 +#, fuzzy +msgid "Affiliation:" +msgstr "Notifications" + +#: templates/moderation/_documents.html:68 +msgid "Document belongs to group:" +msgstr "" + +#: templates/moderation/_documents.html:78 +#, fuzzy +msgid "Date:" +msgstr "Date" + +#: templates/moderation/_documents.html:83 +msgid "Adult" +msgstr "" + +#: templates/moderation/_documents.html:84 +msgid "Contains adult conent. (if checked, post is hidden for most users)" +msgstr "" + +#: templates/moderation/_documents.html:88 +#: templates/moderation/tagparty.html:22 +#, fuzzy +msgid "Tags:" +msgstr "Tags" + +#: templates/moderation/_documents.html:90 +msgid "Separate tags with commas" +msgstr "" + +#: templates/moderation/_documents.html:91 +msgid "Separate with commas" +msgstr "" + +#: templates/moderation/_documents.html:96 +#: templates/moderation/_users.html:380 +#, fuzzy +msgid "Reply ID:" +msgstr "Identifiant de réponse" + +#: templates/moderation/_documents.html:98 +#, fuzzy +msgid "This document is a reply to:" +msgstr "Cet article est en réponse aux commentaires sur" + +#: templates/moderation/_documents.html:103 +msgid "Replies to this document use this code:" +msgstr "" + +#: templates/moderation/_documents.html:111 +#, fuzzy +msgid "Status:" +msgstr "Status" + +#: templates/moderation/_documents.html:124 +msgid "" +"Document is not public because the author is not enrolled or not active." +msgstr "" + +#: templates/moderation/_documents.html:135 +msgid "Queue for return:" +msgstr "" + +#: templates/moderation/_documents.html:135 +msgid "return by request" +msgstr "" + +#: templates/moderation/_documents.html:136 +msgid "refuse by policy" +msgstr "" + +#: templates/moderation/_documents.html:152 templates/scanning/delete.html:11 +msgid "comments" +msgstr "commentaires" + +#: templates/moderation/_documents.html:159 +#, fuzzy +msgid "Campaign" +msgstr "Campagnes" + +#: templates/moderation/_documents.html:160 +#, fuzzy +msgid "public" +msgstr "Publié" + +#: templates/moderation/_documents.html:160 +msgid "not public yet" +msgstr "" + +#: templates/moderation/_documents.html:166 +#, fuzzy +msgid "Page" +msgstr "Pages:" + +#: templates/moderation/_documents.html:167 +msgid "rotate counter-clockwise" +msgstr "" + +#: templates/moderation/_documents.html:168 +msgid "rotate clockwise" +msgstr "" + +#: templates/moderation/_documents.html:169 +msgid "rotate 1 degree counter-clockwise" +msgstr "" + +#: templates/moderation/_documents.html:170 +msgid "rotate 1 degree clockwise" +msgstr "" + +#: templates/moderation/_documents.html:171 +msgid "move this page up" +msgstr "" + +#: templates/moderation/_documents.html:172 +msgid "move this page down" +msgstr "" + +#: templates/moderation/_documents.html:173 +#: templates/moderation/_documents.html:174 +msgid "redact image" +msgstr "" + +#: templates/moderation/_documents.html:175 +msgid "crop image" +msgstr "" + +#: templates/moderation/_documents.html:176 +msgid "select highlight" +msgstr "" + #: templates/moderation/_groups.html:11 #, fuzzy msgid "Affiliations" @@ -2765,11 +3269,7 @@ msgstr "NECESSITE UNE INTERVENTION" #: templates/moderation/_notes.html:59 msgid "Assigned to" -msgstr "Assigné à" - -#: templates/moderation/_notes.html:61 -msgid "By" -msgstr "Par" +msgstr "Assigné à" #: templates/moderation/_notes.html:68 msgid "Edit note" @@ -2783,6 +3283,61 @@ msgstr "Supprimer la note" msgid "Mark resolved" msgstr "Marquer comme résolu" +#: templates/moderation/_pendingscans.html:5 +#, fuzzy +msgid "Incoming Mail" +msgstr "Courrier sortant" + +#: templates/moderation/_pendingscans.html:7 +msgid "" +"\n" +"\t The following letters have been received, but scans for them\n" +"\t have not yet been processed.\n" +"\t " +msgstr "" + +#: templates/moderation/_pendingscans.html:17 +#, fuzzy +msgid "Organization:" +msgstr "Supprimer le compte" + +#: templates/moderation/_pendingscans.html:29 +#, fuzzy +msgid "Add new letter:" +msgstr "Ajouter une note" + +#: templates/moderation/_pendingscans.html:40 +msgid "Missing" +msgstr "" + +#: templates/moderation/_pendingscans.html:44 +msgid "Received" +msgstr "" + +#: templates/moderation/_pendingscans.html:45 +#: templates/moderation/_users.html:310 +#, fuzzy +msgid "Address" +msgstr "Adresse manquante" + +#: templates/moderation/_pendingscans.html:46 +#, fuzzy +msgid "Remove?" +msgstr "Supprimer" + +#: templates/moderation/_pendingscans.html:47 +msgid "Missing?" +msgstr "" + +#: templates/moderation/_pendingscans.html:48 +#: templates/moderation/_scans.html:93 +msgid "Code" +msgstr "Code" + +#: templates/moderation/_pendingscans.html:74 +msgid "scan" +msgstr "" + #: templates/moderation/_scans.html:6 msgid "Scans needing attention" msgstr "Scans nécéssitant du travail" @@ -2838,10 +3393,6 @@ msgstr "Re-importer le scan" msgid "Merge scans" msgstr "Fusionner les scans" -#: templates/moderation/_scans.html:93 -msgid "Code" -msgstr "Code" - #: templates/moderation/_scans.html:94 msgid "Scan Code" msgstr "Code du scan" @@ -2862,6 +3413,258 @@ msgstr "Photo" msgid "Edit documents" msgstr "Editer les documents" +#: templates/moderation/_users.html:7 templates/moderation/_users.html:62 +#, fuzzy +msgid "Create new user" +msgstr "Supprimer l'utilisateur" + +#: templates/moderation/_users.html:10 +msgid "Full name*" +msgstr "" + +#: templates/moderation/_users.html:12 +msgid "e.g., John Smith (Do not include number here)" +msgstr "" + +#: templates/moderation/_users.html:16 +#, fuzzy +msgid "Mailing address*" +msgstr "Adresse email" + +#: templates/moderation/_users.html:21 +msgid "Prisoner number as first line. Full address on next." +msgstr "" + +#: templates/moderation/_users.html:25 +msgid "Blogger?*" +msgstr "" + +#: templates/moderation/_users.html:32 +msgid "Managed?*" +msgstr "" + +#: templates/moderation/_users.html:39 +msgid "Email " +msgstr "" + +#: templates/moderation/_users.html:43 +msgid "Blog name " +msgstr "" + +#: templates/moderation/_users.html:47 +msgid "leave blank unless specified by user" +msgstr "" + +#: templates/moderation/_users.html:51 templates/moderation/_users.html:336 +#, fuzzy +msgid "Organization" +msgstr "Supprimer le compte" + +#: templates/moderation/_users.html:73 +msgid "Create new user?" +msgstr "" + +#: templates/moderation/_users.html:81 +msgid "No results." +msgstr "" + +#: templates/moderation/_users.html:94 +#, fuzzy +msgid "Bloggers" +msgstr "Blogs" + +#: templates/moderation/_users.html:99 +#, fuzzy +msgid "Commenters" +msgstr "Commentaires" + +#: templates/moderation/_users.html:104 +#, fuzzy +msgid "Select user:" +msgstr "Supprimer l'utilisateur" + +#: templates/moderation/_users.html:113 +#, fuzzy +msgid "Inactive" +msgstr "actif" + +#: templates/moderation/_users.html:116 +#, fuzzy +msgid "Blogger:" +msgstr "Blogs" + +#: templates/moderation/_users.html:120 +msgid "Mail held" +msgstr "" + +#: templates/moderation/_users.html:123 templates/moderation/_users.html:174 +#, fuzzy +msgid "Managed" +msgstr "Gérer les tâches" + +#: templates/moderation/_users.html:126 +msgid "Unmanaged" +msgstr "" + +#: templates/moderation/_users.html:129 +#, fuzzy +msgid "invited" +msgstr "Invités" + +#: templates/moderation/_users.html:131 +#, fuzzy +msgid "waitlisted" +msgstr "Sur liste d'attente" + +#: templates/moderation/_users.html:133 +#, fuzzy +msgid "waitlistable" +msgstr "Possibilité d'entrer sur la liste d'attente" + +#: templates/moderation/_users.html:135 templates/moderation/_users.html:157 +#, fuzzy +msgid "blog" +msgstr "blogs" + +#: templates/moderation/_users.html:137 +#, fuzzy +msgid "Commenter" +msgstr "Commentaire" + +#: templates/moderation/_users.html:154 +#, fuzzy +msgid "Joined:" +msgstr "S'inscrire" + +#: templates/moderation/_users.html:156 +#, fuzzy +msgid "letters" +msgstr "Lettres" + +#: templates/moderation/_users.html:172 +#, fuzzy +msgid "Active" +msgstr "actif" + +#: templates/moderation/_users.html:173 +#, fuzzy +msgid "Blogger" +msgstr "Blogs" + +#: templates/moderation/_users.html:175 +msgid "License signed" +msgstr "" + +#: templates/moderation/_users.html:176 +msgid "Hold Mail" +msgstr "" + +#: templates/moderation/_users.html:195 +msgid "No email on file." +msgstr "" + +#: templates/moderation/_users.html:199 templates/moderation/_users.html:349 +#, fuzzy +msgid "Notes" +msgstr "Ajouter une note" + +#: templates/moderation/_users.html:215 templates/moderation/_users.html:330 +#, fuzzy +msgid "Joined" +msgstr "S'inscrire" + +#: templates/moderation/_users.html:221 +#, fuzzy +msgid "Last login" +msgstr "s'authentifier" + +#: templates/moderation/_users.html:226 +msgid "Tagger" +msgstr "" + +#: templates/moderation/_users.html:229 +msgid "May add tags to posts:" +msgstr "" + +#: templates/moderation/_users.html:238 +msgid "No activity." +msgstr "" + +#: templates/moderation/_users.html:240 +msgid "Activity over time" +msgstr "" + +#: templates/moderation/_users.html:244 +#, fuzzy +msgid "Favorites" +msgstr "Invités" + +#: templates/moderation/_users.html:278 +msgid "Relationships" +msgstr "" + +#: templates/moderation/_users.html:279 +msgid "This commenter has interacted with the following bloggers:" +msgstr "" + +#: templates/moderation/_users.html:306 +msgid "Name" +msgstr "" + +#: templates/moderation/_users.html:320 +msgid "Blog name" +msgstr "" + +#: templates/moderation/_users.html:323 +#, fuzzy +msgid "Email" +msgstr "envoyez moi un mail" + +#: templates/moderation/_users.html:339 templates/moderation/stats.html:53 +msgid "Profiles" +msgstr "Profils" + +#: templates/moderation/_users.html:341 templates/moderation/stats.html:38 +#: templates/moderation/stats.html.py:48 +msgid "Posts" +msgstr "Articles" + +#: templates/moderation/_users.html:343 +msgid "Requests" +msgstr "" + +#: templates/moderation/_users.html:345 +#, fuzzy +msgid "Photos" +msgstr "Photo" + +#: templates/moderation/_users.html:351 +#, fuzzy +msgid "Correspondence" +msgstr "Correspondance envoyée" + +#: templates/moderation/_users.html:354 +#, fuzzy +msgid "Missing Scans" +msgstr "Fusionner la numérisation" + +#: templates/moderation/_users.html:356 +msgid "License Agreement" +msgstr "" + +#: templates/moderation/_users.html:370 +#, fuzzy +msgid "Server error! Changes not saved." +msgstr "Changements enregistrés." + +#: templates/moderation/_users.html:377 +msgid "Adult:" +msgstr "" + +#: templates/moderation/_users.html:379 +msgid "Queue printout" +msgstr "" + #: templates/moderation/base.html:3 msgid "active" msgstr "actif" @@ -2890,16 +3693,11 @@ msgstr "Fusionner les scans" msgid "Manage users" msgstr "Gérer les tâches" -#: templates/moderation/home.html:20 -#, fuzzy -msgid "Outgoing mail" -msgstr "Courrier sortant" - #: templates/moderation/home.html:25 msgid "Tag party" msgstr "" -#: templates/moderation/home.html:27 templates/moderation/stats.html:10 +#: templates/moderation/home.html:27 templates/moderation/stats.html:11 msgid "Stats" msgstr "Stats" @@ -2948,15 +3746,43 @@ msgstr "en attente de la page pour la tâche" msgid "link" msgstr "lien" -#: templates/moderation/stats.html:13 +#: templates/moderation/page_picker.html:7 +msgid "Page picker" +msgstr "" + +#: templates/moderation/page_picker.html:40 +#, fuzzy +msgid "Document page IDs:" +msgstr "Documents" + +#: templates/moderation/page_picker.html:41 +#, fuzzy +msgid "Read page IDs" +msgstr "Pages numérisées" + +#: templates/moderation/page_picker.html:42 +#, fuzzy +msgid "Document IDs:" +msgstr "Documents" + +#: templates/moderation/questions_index.html:3 +#, fuzzy +msgid "Question stats" +msgstr "Préférences d'abonnements" + +#: templates/moderation/questions_index.html:5 +msgid "Database Questions" +msgstr "" + +#: templates/moderation/stats.html:14 msgid "Users" msgstr "Utilisateurs" -#: templates/moderation/stats.html:15 +#: templates/moderation/stats.html:16 msgid "Current breakdown" msgstr "Répartission actuelle" -#: templates/moderation/stats.html:18 +#: templates/moderation/stats.html:19 msgid "" "\n" "\t A treemap showing various user statuses, with the number of users\n" @@ -2966,11 +3792,11 @@ msgid "" "\t " msgstr "" -#: templates/moderation/stats.html:25 +#: templates/moderation/stats.html:26 msgid "New users per week" msgstr "Nouveaux utilisateurs par semaine" -#: templates/moderation/stats.html:28 +#: templates/moderation/stats.html:29 msgid "" "\n" " The number of new users that are added per week. Spikes in " @@ -2981,27 +3807,19 @@ msgid "" " " msgstr "" -#: templates/moderation/stats.html:37 templates/moderation/stats.html.py:47 -msgid "Posts" -msgstr "Articles" - -#: templates/moderation/stats.html:39 templates/moderation/stats.html.py:91 +#: templates/moderation/stats.html:40 templates/moderation/stats.html.py:92 msgid "Totals" msgstr "Totaux" -#: templates/moderation/stats.html:43 +#: templates/moderation/stats.html:44 msgid "Total" msgstr "Total" -#: templates/moderation/stats.html:52 -msgid "Profiles" -msgstr "Profils" - -#: templates/moderation/stats.html:60 +#: templates/moderation/stats.html:61 msgid "Timeline (by week)" msgstr "Ligne de temps (par semaine)" -#: templates/moderation/stats.html:63 +#: templates/moderation/stats.html:64 msgid "" "\n" " The timeline shows the number of requests, posts, and profiles\n" @@ -3011,11 +3829,11 @@ msgid "" " " msgstr "" -#: templates/moderation/stats.html:70 +#: templates/moderation/stats.html:71 msgid "Impact: Posts" msgstr "Impact: Articles" -#: templates/moderation/stats.html:73 +#: templates/moderation/stats.html:74 msgid "" "\n" " This graph shows the number of posts ordered by author, to\n" @@ -3024,11 +3842,11 @@ msgid "" " " msgstr "" -#: templates/moderation/stats.html:79 +#: templates/moderation/stats.html:80 msgid "Impact: Pages" msgstr "Impact: Pages" -#: templates/moderation/stats.html:82 +#: templates/moderation/stats.html:83 msgid "" "\n" " This graph shows the contribution by page count. Some authors\n" @@ -3036,23 +3854,23 @@ msgid "" " " msgstr "" -#: templates/moderation/stats.html:93 +#: templates/moderation/stats.html:94 msgid "Comments published" msgstr "Commentaires publiés" -#: templates/moderation/stats.html:95 +#: templates/moderation/stats.html:96 msgid "Comments posted per week" msgstr "Commentaires publiés par semaine" -#: templates/moderation/stats.html:98 +#: templates/moderation/stats.html:99 msgid "This graph shows the number of new comments posted per week." msgstr "Ce graph montre le nombre de nouveaux commentaires postés par semaine." -#: templates/moderation/stats.html:101 +#: templates/moderation/stats.html:102 msgid "Commenter Impact" msgstr "Impact du commenteur" -#: templates/moderation/stats.html:104 +#: templates/moderation/stats.html:105 msgid "" "\n" " This graph shows the number of comments posted by particular " @@ -3062,7 +3880,7 @@ msgid "" " " msgstr "" -#: templates/moderation/stats.html:120 +#: templates/moderation/stats.html:121 msgid "" "\n" " This shows the breakdown of letters that we send per week. " @@ -3074,7 +3892,7 @@ msgid "" " " msgstr "" -#: templates/moderation/stats.html:131 +#: templates/moderation/stats.html:132 msgid "" "\n" " This shows the breakdown of recipients of letters we send, " @@ -3083,6 +3901,40 @@ msgid "" " " msgstr "" +#: templates/moderation/tagparty.html:35 +msgid "Next »" +msgstr "" + +#: templates/moderation/wait_for_processing.html:9 +#, fuzzy +msgid "Processing" +msgstr "Fusionner les scans" + +#: templates/moderation/wait_for_processing.html:12 +msgid "Waiting for processing to finish" +msgstr "" + +#: templates/moderation/wait_for_processing.html:15 +msgid "You will be redirected when we are finished." +msgstr "" + +#: templates/moderation/wait_for_processing.html:32 +msgid "Invalid task." +msgstr "" + +#: templates/moderation/wait_for_processing.html:40 +msgid "Task exited with errors." +msgstr "" + +#: templates/moderation/wait_for_processing.html:42 +#, fuzzy +msgid "View task" +msgstr "Voir l'article" + +#: templates/moderation/wait_for_processing.html:51 +msgid "Error communicating with server. Refresh page to retry." +msgstr "" + #: templates/notification/email_body.txt:2 msgid "Greetings" msgstr "" @@ -3265,16 +4117,16 @@ msgstr "Supprimer scan" msgid "Are you sure you want to remove your profile scan?" msgstr "Êtes vous sûr de vouloir supprimer le scan de votre profil ?" -#: templates/profiles/confirm_delete_self.html:2 +#: templates/profiles/confirm_delete_self.html:3 #: templates/profiles/profile_edit.html:49 msgid "Delete account" msgstr "Supprimer le compte" -#: templates/profiles/confirm_delete_self.html:4 +#: templates/profiles/confirm_delete_self.html:5 msgid "Delete account permanently?" msgstr "Supprimer le compte de manière permantente ?" -#: templates/profiles/confirm_delete_self.html:6 +#: templates/profiles/confirm_delete_self.html:7 msgid "" "\n" "Are you sure you want to delete your account? This cannot be undone. You " @@ -3287,11 +4139,11 @@ msgstr "" "irreversible. Vous ne pourrez plus vous authentifier et toutes les " "informations de votre profil seront supprimées.\n" -#: templates/profiles/confirm_delete_self.html:19 +#: templates/profiles/confirm_delete_self.html:20 msgid "Delete comments" msgstr "Supprimer les commentaires" -#: templates/profiles/confirm_delete_self.html:22 +#: templates/profiles/confirm_delete_self.html:23 msgid "" "\n" " Note: Once things are on the Internet, it's nearly impossible for " @@ -3312,7 +4164,7 @@ msgstr "" "imprimés et envoyés par la poste aux auteurs des articles commentés. Nous " "pouvons néansmoins supprimer ces informations." -#: templates/profiles/confirm_delete_self.html:31 +#: templates/profiles/confirm_delete_self.html:32 msgid "" "\n" " Once you delete your account, you will be unable to later delete\n" @@ -3325,7 +4177,7 @@ msgstr "" "supprimer vos commentaires si vous ne les supprimez pas maintenant. Dans " "tous les cas, votre profil ne sera plus associé à ces commentaires." -#: templates/profiles/confirm_delete_self.html:38 +#: templates/profiles/confirm_delete_self.html:39 #, python-format msgid "" "\n" @@ -3334,7 +4186,7 @@ msgid "" "\t" msgstr "" -#: templates/profiles/confirm_delete_self.html:45 +#: templates/profiles/confirm_delete_self.html:46 msgid "Delete account permanently" msgstr "Supprimer le compte définitivement" @@ -3382,9 +4234,9 @@ msgid "" "\t\t" msgstr "" "\n" -"Pour les organisation assistants plusieurs auteurs, %(site.name)s peut mettre " -"en place une page spécifique à cette organisation permettant ainsi de mettre " -"en valeur ces auteurs ainsi que l'organisation en elle même." +"Pour les organisation assistants plusieurs auteurs, %(site.name)s peut " +"mettre en place une page spécifique à cette organisation permettant ainsi de " +"mettre en valeur ces auteurs ainsi que l'organisation en elle même." #: templates/profiles/groups_list.html:57 #, python-format @@ -3772,11 +4624,6 @@ msgstr "" msgid "Revision" msgstr "Révision" -#: templates/scanning/_column_diff.html:6 -#: templates/scanning/_column_diff.html:8 -msgid "ago" -msgstr "il y a" - #: templates/scanning/after_transcribe_comment.html:4 msgid "Leave a note" msgstr "Laisser une note" @@ -3821,10 +4668,6 @@ msgstr "Supprimer (irreversible)" msgid "pages" msgstr "pages" -#: templates/scanning/delete.html:11 -msgid "comments" -msgstr "commentaires" - #: templates/scanning/delete.html:14 msgid "Scan pages" msgstr "Pages numérisées" @@ -3845,11 +4688,11 @@ msgstr "" msgid "Notify moderators" msgstr "Prévenir les modérateurs" -#: templates/scanning/merge.html:5 +#: templates/scanning/merge.html:6 msgid "Merge Scan" msgstr "Fusionner la numérisation" -#: templates/scanning/merge.html:6 +#: templates/scanning/merge.html:7 msgid "" "Choose a PDF file to merge (add to the bottom of) this scan's PDF. Use this " "if, for example, someone adds an additional page to a profile." @@ -3867,15 +4710,15 @@ msgid "" "with this scan unavailable until the import is finished." msgstr "" -#: templates/scanning/replace.html:3 templates/scanning/upload.html:4 +#: templates/scanning/replace.html:4 templates/scanning/upload.html:4 msgid "Upload scans" msgstr "Envoi de fichiers" -#: templates/scanning/replace.html:5 +#: templates/scanning/replace.html:6 msgid "Replace Scan" msgstr "Remplacer la numérisation" -#: templates/scanning/replace.html:6 +#: templates/scanning/replace.html:7 msgid "Choose a PDF file to replace this scan's with." msgstr "Choisir un PDF pour remplacer cette numérisation." @@ -3883,10 +4726,6 @@ msgstr "Choisir un PDF pour remplacer cette numérisation." msgid "Transcription revisions" msgstr "Révisions de la retranscription" -#: templates/scanning/revision_list.html:14 -msgid "edit transcription" -msgstr "editer la retranscription" - #: templates/scanning/revision_list.html:27 msgid "Compare" msgstr "Comparer" @@ -3929,6 +4768,35 @@ msgstr "" "Envoyer des fichiers PDF individuellement ou un fichier ZIP contenant " "plusieurs PDFs. " +#: templates/subscriptions/mailing_list_interest.html:5 +msgid "Sign up for mailing list" +msgstr "" + +#: templates/subscriptions/mailing_list_interest.html:8 +#, fuzzy +msgid "Mailing List" +msgstr "Publipostages : " + +#: templates/subscriptions/mailing_list_interest.html:9 +msgid "" +"Sign up for our low-volume mailing list to stay up to date with Between the " +"Bars!" +msgstr "" + +#: templates/subscriptions/mailing_list_interest.html:15 +#, fuzzy +msgid "Sign up" +msgstr "Enregistrez moi!" + +#: templates/subscriptions/mailing_list_thanks.html:5 +#: templates/subscriptions/mailing_list_thanks.html:8 +msgid "Thanks!" +msgstr "" + +#: templates/subscriptions/mailing_list_thanks.html:9 +msgid "Sign up received. Thanks for your interest!" +msgstr "" + #: templates/subscriptions/subscribe_to.html:5 #: templates/subscriptions/subscribe_to.html:9 msgid "Add subscription" @@ -3987,9 +4855,6 @@ msgstr "" #~ msgid "Edit" #~ msgstr "Éditer" -#~ msgid "Delete comment" -#~ msgstr "Supprimer le commentaire" - #~ msgid "Flag comment" #~ msgstr "Signaler le commentaire" @@ -3999,9 +4864,6 @@ msgstr "" #~ msgid "view as blog post" #~ msgstr "voir comme un article de blog" -#~ msgid "Address missing" -#~ msgstr "Adresse manquante" - #~ msgid "Add one?" #~ msgstr "Ajouter une adresse ?" @@ -4025,8 +4887,5 @@ msgstr "" #~ msgid "No comments" #~ msgstr "Pas de commentaires" -#~ msgid "Transcriptions" -#~ msgstr "Retranscriptions" - #~ msgid "No transcriptions" #~ msgstr "Pas de retranscriptions" From c0b2c8d070dea024439bd9c4c27e306554b05fcf Mon Sep 17 00:00:00 2001 From: Charlie DeTar Date: Mon, 20 Oct 2014 20:32:55 -0600 Subject: [PATCH 51/53] Convert tabs to spaces --- scanblog/profiles/views.py | 2 - scanblog/templates/about/faq.html | 56 ++--- scanblog/templates/about/index.html | 76 +++---- scanblog/templates/blogs/_blog_cloud.html | 40 ++-- scanblog/templates/blogs/_post_pagegroup.html | 26 +-- scanblog/templates/blogs/_related.html | 3 +- .../templates/blogs/all_comments_list.html | 4 +- .../templates/blogs/author_post_list.html | 4 +- scanblog/templates/blogs/base_post_list.html | 2 +- scanblog/templates/blogs/edit_post.html | 68 +++--- scanblog/templates/blogs/page_picker.html | 198 +++++++++--------- scanblog/templates/blogs/post_detail.html | 86 ++++---- scanblog/templates/comments/_comment.html | 4 +- .../templates/comments/_comment_form.html | 34 +-- scanblog/templates/comments/preview.html | 40 ++-- scanblog/templates/correspondence/base.html | 12 +- .../correspondence/base_letter_list.html | 26 +-- .../mass_mailing_spreadsheet.html | 16 +- .../templates/correspondence/pending.html | 112 +++++----- .../correspondence/show_commentmailing.html | 28 +-- scanblog/templates/feeds/_subscriptions.html | 170 +++++++-------- scanblog/templates/home.html | 2 +- scanblog/templates/lint.py | 4 +- .../templates/moderation/_correspondence.html | 68 +++--- scanblog/templates/moderation/_groups.html | 54 ++--- .../templates/moderation/_pendingscans.html | 10 +- scanblog/templates/moderation/_scans.html | 8 +- scanblog/templates/moderation/stats.html | 28 +-- .../notification/notice_settings.html | 94 ++++----- .../profiles/confirm_delete_self.html | 12 +- scanblog/templates/profiles/groups_list.html | 178 ++++++++-------- .../templates/profiles/profiles_list.html | 30 +-- scanblog/templates/registration/login.html | 14 +- 33 files changed, 755 insertions(+), 754 deletions(-) diff --git a/scanblog/profiles/views.py b/scanblog/profiles/views.py index 5821925..43069ce 100644 --- a/scanblog/profiles/views.py +++ b/scanblog/profiles/views.py @@ -2,7 +2,6 @@ import datetime from collections import defaultdict -from django.conf import settings from django.contrib.auth.models import User, Group, Permission from django.contrib.auth.decorators import login_required, permission_required from django.shortcuts import get_object_or_404, render, redirect @@ -95,7 +94,6 @@ def delete(request, user_id): if request.method != 'POST': return render(request, "profiles/confirm_delete_self.html") - # POST delete_comments = request.POST.get('delete_comments', False) if delete_comments: diff --git a/scanblog/templates/about/faq.html b/scanblog/templates/about/faq.html index b5ce3c6..8e3dd7a 100644 --- a/scanblog/templates/about/faq.html +++ b/scanblog/templates/about/faq.html @@ -15,37 +15,37 @@

{% trans "Frequently Asked Questions" %}

{%trans "Who is behind this?" %}

- {% blocktrans %} + {% blocktrans %} Since the summer 2011, Between the Bars has been operated by Charlie DeTar, Carl McLaren, and Benjamin Sugar. The site would not be possible without the generous contributions of transcribers, commenters, and everyone at the Center for Civic Media. - {% endblocktrans %} + {% endblocktrans %}

{%trans "How did it begin?" %}

- {% blocktrans %} + {% blocktrans %} Between the Bars was founded by Charlie DeTar and Benjamin Mako Hill in the Center for Future Civic Media at MIT in October of 2010. - {% endblocktrans %} + {% endblocktrans %}

{% trans "Why blogging?" %}

-

"It's his lifeline really. He gets printouts back. The - other inmates get copies as well and they're quite pleased. - It's a link, not just for him to the outside world, but for his - inmate friends as well; a lifeline to the outside world."
- +

"It's his lifeline really. He gets printouts back. The + other inmates get copies as well and they're quite pleased. + It's a link, not just for him to the outside world, but for his + inmate friends as well; a lifeline to the outside world."
+ – {% blocktrans %} Derick Attwood, father of imprisoned Shaun Attwood, speaking about his son's blog, Jon's Jail Journal.

{% endblocktrans %} - -
-

- I think what it really has to do is being listened to.... These - people are saying 'please don't presume to speak for me'. - We have a fascinating backdoor open with blogs... it really is - diverse and complicated.
- + +

+

+ I think what it really has to do is being listened to.... These + people are saying 'please don't presume to speak for me'. + We have a fascinating backdoor open with blogs... it really is + diverse and complicated.
+ – {% blocktrans %} Ethan Zuckerman, speaking about "bridge blogs" that @@ -53,17 +53,17 @@

{% trans "Frequently Asked Questions" %}

media. (source) {% endblocktrans %} - -

-

- {% blocktrans %} - Blogging can not only let people in prison tell their stories and - report on their conditions, but it can also provide an instrumental - role in maintaining "weak-tie" social networks (acquaintances and - friends of friends), which are important for helping people - to find jobs and communities in which to live. This can reduce recidivism. - {% endblocktrans %} -

+ +

+

+ {% blocktrans %} + Blogging can not only let people in prison tell their stories and + report on their conditions, but it can also provide an instrumental + role in maintaining "weak-tie" social networks (acquaintances and + friends of friends), which are important for helping people + to find jobs and communities in which to live. This can reduce recidivism. + {% endblocktrans %} +

{% trans "How often do prisoners receive comments that I leave?" %}

diff --git a/scanblog/templates/about/index.html b/scanblog/templates/about/index.html index 7943f7b..d473656 100644 --- a/scanblog/templates/about/index.html +++ b/scanblog/templates/about/index.html @@ -5,36 +5,36 @@ {% block body %}

{% blocktrans %} - US Correctional Populations -
-
- Source: - - Citizenship, Democracy, and the Civic Reintegration of Criminal Offenders - -
-
- When Prisoners Come Home -
-
- Source: - - When prisoners come home: parole and prisoner reentry - - by Joan Petersilia -
-
+ US Correctional Populations +
+
+ Source: + + Citizenship, Democracy, and the Civic Reintegration of Criminal Offenders + +
+
+ When Prisoners Come Home +
+
+ Source: + + When prisoners come home: parole and prisoner reentry + + by Joan Petersilia +
+
{% endblocktrans %}

@@ -61,9 +61,9 @@

{% trans "Leave comments" %}

{% blocktrans %} - Registered users can comment on blog posts. We periodically mail - comment feeds back to the authors so they can hear from their fans and - continue the discussion. + Registered users can comment on blog posts. We periodically mail + comment feeds back to the authors so they can hear from their fans and + continue the discussion. Sign up and log in today! {% endblocktrans %} @@ -71,13 +71,13 @@

{% trans "Leave comments" %}

{% trans "Transcribe posts" %}

{% blocktrans with site_name=site.name %} - {{ site_name }} relies on visitors to transcribe its bloggers' posts. - You can help us out by - signing up and - logging in, - and starting to transcribe posts that interest you. Transcriptions - make the blogs more accessible to search engines, translators and - visitors. + {{ site_name }} relies on visitors to transcribe its bloggers' posts. + You can help us out by + signing up and + logging in, + and starting to transcribe posts that interest you. Transcriptions + make the blogs more accessible to search engines, translators and + visitors. {% endblocktrans %}


@@ -85,7 +85,7 @@

{% trans "Transcribe posts" %}


{% blocktrans %} - Center for Civic Media + Center for Civic Media {% endblocktrans %}


diff --git a/scanblog/templates/blogs/_blog_cloud.html b/scanblog/templates/blogs/_blog_cloud.html index 4381442..d88de6e 100644 --- a/scanblog/templates/blogs/_blog_cloud.html +++ b/scanblog/templates/blogs/_blog_cloud.html @@ -2,24 +2,24 @@

- {% trans "Categories" %} - + data-target='.categories'> + {% trans "Categories" %} + - {% trans "Recent posts" %} - + data-target='.recent'> + {% trans "Recent posts" %} + - {% trans "Comments" %} - + data-target='.comments'> + {% trans "Comments" %} + - {% trans "Authors" %} - + data-target='.authors'> + {% trans "Authors" %} + - {% trans "Every Page" %} - + {% trans "Every Page" %} +
@@ -86,8 +86,8 @@

{% trans "Recent posts" %}

{% endfor %}
  • - {% trans "All posts by date" %} -
    • + {% trans "All posts by date" %} +
    @@ -98,8 +98,8 @@

    {% trans "Recent comments" %}


    {% trans "on" %} {{ comment.document.get_title }} {% trans "by" %} {{ comment.document.author.profile }} {% endfor %}
  • - {% trans "All comments" %} -
    • + {% trans "All comments" %} +
    @@ -114,8 +114,8 @@

    {% trans "Authors with recent posts" %}

    {% endfor %}
  • - {% trans "All authors" %} -
    • + {% trans "All authors" %} +
    diff --git a/scanblog/templates/blogs/_post_pagegroup.html b/scanblog/templates/blogs/_post_pagegroup.html index 15a568c..35a4598 100644 --- a/scanblog/templates/blogs/_post_pagegroup.html +++ b/scanblog/templates/blogs/_post_pagegroup.html @@ -2,22 +2,22 @@ {% load public_url %} {% for page in documentpages %}
    - - - {% trans "page" %} {{ page.page_number }}/{{ documentpage_count }} - + + + {% trans "page" %} {{ page.page_number }}/{{ documentpage_count }} +
    - {% trans 'Scanned page' %} + {% trans 'Scanned page' %}
    {% if forloop.last and documentpage_count > page.page_number %} - - {% trans "Read more" %} - {% if remaining %} - {# FIXME don't know how to translate remaining w/ pluralize #} - ({{ remaining }} more page{{ remaining|pluralize }}) - {% endif %} - + + {% trans "Read more" %} + {% if remaining %} + {# FIXME don't know how to translate remaining w/ pluralize #} + ({{ remaining }} more page{{ remaining|pluralize }}) + {% endif %} + {% endif %} {% endfor %} diff --git a/scanblog/templates/blogs/_related.html b/scanblog/templates/blogs/_related.html index 058206b..6ea2724 100644 --- a/scanblog/templates/blogs/_related.html +++ b/scanblog/templates/blogs/_related.html @@ -1,4 +1,5 @@ {% load thumbnail %} +{% load i18n %} {% load public_url %} {% if related.items %} {% if related.title %} @@ -26,7 +27,7 @@

    {{ related.title }}

    {% endfor%} {% if related.more %} - {{ more }}... + {% trans "More..." %} {% endif %} diff --git a/scanblog/templates/blogs/all_comments_list.html b/scanblog/templates/blogs/all_comments_list.html index adb55f2..90bc056 100644 --- a/scanblog/templates/blogs/all_comments_list.html +++ b/scanblog/templates/blogs/all_comments_list.html @@ -19,12 +19,12 @@

    {{ recent_comments }}

    {{ posted_on }} {{ doc.get_title }} {{ i18n_by }} {{ comment.document.author.profile }} {% thumbnail doc.documentpage_set.all.0.image.path "100" as im %} - {{ doc.get_title }} - + {% endthumbnail %}
    {% endwith %} diff --git a/scanblog/templates/blogs/author_post_list.html b/scanblog/templates/blogs/author_post_list.html index ea81893..2e40bc5 100644 --- a/scanblog/templates/blogs/author_post_list.html +++ b/scanblog/templates/blogs/author_post_list.html @@ -1,6 +1,6 @@ {% extends "blogs/base_post_list.html" %} {% load i18n %} -{% trans "by" as by %} +{% trans "by" as by context "authored by" %} {% block title %} {% if author.profile.blog_name %} {{ author.profile.blog_name }} {{ by }} {{ author.profile.display_name }} @@ -11,7 +11,7 @@ {% block heading %} {% if author.profile.blog_name %}

    {{ author.profile.blog_name }}

    - {% trans "by" %} {{ author.profile.display_name }} + {{ by }} {{ author.profile.display_name }} {% else %}

    {{ author.profile.display_name }}

    {% endif %} diff --git a/scanblog/templates/blogs/base_post_list.html b/scanblog/templates/blogs/base_post_list.html index c6fbeda..8ec098b 100644 --- a/scanblog/templates/blogs/base_post_list.html +++ b/scanblog/templates/blogs/base_post_list.html @@ -21,7 +21,7 @@ {% if page.paginator.num_pages > 1 %} -{{ more_posts }} : +{% trans "More posts" %}: {% include "_pagination.html" %} {% include "blogs/_related.html" %} diff --git a/scanblog/templates/blogs/edit_post.html b/scanblog/templates/blogs/edit_post.html index bd55901..a0adf17 100644 --- a/scanblog/templates/blogs/edit_post.html +++ b/scanblog/templates/blogs/edit_post.html @@ -4,57 +4,57 @@ {% block title %} {% if post.pk %} - {% trans "Editing post" %} {{ post.get_title }} + {% trans "Editing post" %} {{ post.get_title }} {% else %} - {% trans "Compose post" %} + {% trans "Compose post" %} {% endif %} {% endblock %} {% block body %}

    {% if post.pk %} - {% trans "Editing post" %} {{ post.get_title }} + {% trans "Editing post" %} {{ post.get_title }} {% else %} - {% trans "Compose post" %} + {% trans "Compose post" %} {% endif %}

    {% if post.scan_id %}

    - {% blocktrans %} - Sorry: we're still working on the feature to allow you to edit scans - that were uploaded while you were incarcerated. We're not ready yet! - In the mean time, don't hesitate to write us at - {{ site_email }} - and we an make any changes to the posts if you'd like. - {% endblocktrans %} + {% blocktrans %} + Sorry: we're still working on the feature to allow you to edit scans + that were uploaded while you were incarcerated. We're not ready yet! + In the mean time, don't hesitate to write us at + {{ site_email }} + and we an make any changes to the posts if you'd like. + {% endblocktrans %}

    - {% trans "If you'd like to remove the post, click “Delete post“ below." %} + {% trans "If you'd like to remove the post, click “Delete post“ below." %}

    {% else %}
    {% csrf_token %} - - {{ form.as_table }} - - - - - - - -
    - {% trans "(optional) Comma separated list of categories" %}: -
      - {% if post.pk %} - {% for tag in post.tags.all %} -
    • {{ tag.name }}
      • - {% endfor %} - {% endif %} -
    -
    - -
    + + {{ form.as_table }} + + + + + + + +
    + {% trans "(optional) Comma separated list of categories" %}: +
      + {% if post.pk %} + {% for tag in post.tags.all %} +
    • {{ tag.name }}
      • + {% endfor %} + {% endif %} +
    +
    + +
    {% endif %} diff --git a/scanblog/templates/blogs/page_picker.html b/scanblog/templates/blogs/page_picker.html index bce5665..c226540 100644 --- a/scanblog/templates/blogs/page_picker.html +++ b/scanblog/templates/blogs/page_picker.html @@ -4,39 +4,39 @@ {% block body %}
    diff --git a/scanblog/templates/registration/login.html b/scanblog/templates/registration/login.html index 0299612..80086db 100644 --- a/scanblog/templates/registration/login.html +++ b/scanblog/templates/registration/login.html @@ -23,22 +23,22 @@

    {% url "about.terms" as url_terms %} {% url "about.privacy" as url_privacy %} {% blocktrans %} - Registered users can leave comments and transcribe posts. By + Registered users can leave comments and transcribe posts. By registering, you are agreeing to the Terms of Service and Privacy Policy. - {% endblocktrans %} + {% endblocktrans %}

    {% csrf_token %} {{ reg_form }} - - - + + +
    - -
    + +
    From 19ec4cdfb172a8477b665644df9690a1d1385c48 Mon Sep 17 00:00:00 2001 From: Charlie DeTar Date: Mon, 20 Oct 2014 21:02:45 -0600 Subject: [PATCH 52/53] Fix tags inside {% trans %} tags --- scanblog/TODO | 10 +++++++++- scanblog/templates/about/terms.html | 6 +++++- scanblog/templates/blogs/page_picker.html | 5 ++++- scanblog/templates/blogs/post_detail.html | 6 ++++-- scanblog/templates/btb/org_status_email.html | 6 +++++- scanblog/templates/comments/_comment.html | 7 +++++-- scanblog/templates/comments/remove_comment.html | 13 ++++++++----- .../templates/comments/unremove_comment.html | 6 +++++- scanblog/templates/lint.py | 8 ++++++++ .../templates/notification/notice_settings.html | 4 +++- .../templates/registration/activation_email.txt | 17 +++++++++-------- scanblog/templates/scanning/flag.html | 6 +++++- 12 files changed, 70 insertions(+), 24 deletions(-) diff --git a/scanblog/TODO b/scanblog/TODO index 8345043..fe4f67c 100644 --- a/scanblog/TODO +++ b/scanblog/TODO @@ -2,4 +2,12 @@ * replace ✍ by css class and css display -* optionnal sharing buttons +* optional sharing buttons + +* Replace atomic translations with blocktrans in the following: + - scanblog/templates/blogs/_sharing_buttons.html + - scanblog/templates/blogs/all_comments_list.html + - scanblog/templates/blogs/delete_post.html + - scanblog/templates/blogs/tag_post_list.html + - scanblog/templates/btb/admin-content-flagged.txt + - scanblog/templates/comments/unremove_comment.html diff --git a/scanblog/templates/about/terms.html b/scanblog/templates/about/terms.html index a4ea1bf..f71ee82 100644 --- a/scanblog/templates/about/terms.html +++ b/scanblog/templates/about/terms.html @@ -4,7 +4,11 @@ {% block title %}{% trans "Terms of Use" %}{% endblock %} {% block body %}
    -

    {% trans "{{ site.name }} Terms of Use" %}

    +

    + {% blocktrans with site_name=site.name %} + Terms of Use + {% endblocktrans %} +

    {% blocktrans %} PLEASE REVIEW BEFORE USING THIS WEBSITE – IF YOU DO NOT AGREE TO THESE TERMS OF USE, DO NOT USE THIS WEBSITE. diff --git a/scanblog/templates/blogs/page_picker.html b/scanblog/templates/blogs/page_picker.html index c226540..621a7a6 100644 --- a/scanblog/templates/blogs/page_picker.html +++ b/scanblog/templates/blogs/page_picker.html @@ -40,7 +40,10 @@ }

    {% trans "Every page" %}

    diff --git a/scanblog/templates/blogs/post_detail.html b/scanblog/templates/blogs/post_detail.html index abf6998..393115b 100644 --- a/scanblog/templates/blogs/post_detail.html +++ b/scanblog/templates/blogs/post_detail.html @@ -7,7 +7,8 @@ {% load favorites %} -{% block title %}{% firstof post.title "Untitled" %} — {{post.author.profile}}{% endblock %} +{% trans "Untitled" as untitled_i18n %} +{% block title %}{% firstof post.title untitled_i18n %} — {{post.author.profile}}{% endblock %} {% block head %} {% with feed_author=post.author comment_feed_obj=post %} @@ -33,7 +34,8 @@ {% endif %} {% trans "by" %} {{ post.author.profile.display_name }} {% if post.author.profile.has_public_profile %} - ({% trans "author's profile" %}) + {% blocktrans with profile_url=post.author.profile.get_absolute_url %} + (author's profile) {% endif %} {% if org.public %}, {% trans "writing for" %} {{ org.name }}{% endif %} {% if org.public %}{{ org.footer|safe }}{% endif %} diff --git a/scanblog/templates/btb/org_status_email.html b/scanblog/templates/btb/org_status_email.html index 6a9c752..fa0a6d1 100644 --- a/scanblog/templates/btb/org_status_email.html +++ b/scanblog/templates/btb/org_status_email.html @@ -28,7 +28,11 @@ -

    {% trans "The State of the {{ org.name }} is" %} {{ adjective.word }}

    +

    + {% blocktrans with org_name=org.name adjective_word=adjective.word %} + The State of the {{ org_name }} is {{ adjective_word }} + {% endblocktrans %} +

    {{ adjective.word }}: {{ adjective.definition }}

    {% trans "Distance from inbox zero:" %} {{ inbox_zero_distance }}.

    {% if inbox_zero_distance == 0 %} diff --git a/scanblog/templates/comments/_comment.html b/scanblog/templates/comments/_comment.html index 1d3ff5b..b913d75 100644 --- a/scanblog/templates/comments/_comment.html +++ b/scanblog/templates/comments/_comment.html @@ -14,12 +14,15 @@ - {% trans "Posted {{ comment.created|timesince }} ago." %} + {% blocktrans with time_since_created=comment.created|timesince %} + Posted {{ time_since_created }} ago. + {% endblocktrans %} {% if comment.letter_sent and not comment.removed %} ✓ - {% trans "Mailed {{ comment.letter_sent|timesince }} ago" %} + {% blocktrans with time_since_sent=comment.letter_sent|timesince %} + Mailed {{ time_since_sent }} ago {% endif %} diff --git a/scanblog/templates/comments/remove_comment.html b/scanblog/templates/comments/remove_comment.html index 83010ae..cbe81d1 100644 --- a/scanblog/templates/comments/remove_comment.html +++ b/scanblog/templates/comments/remove_comment.html @@ -36,11 +36,15 @@

    {% trans "Remove Comment" %}

    {% if removal.pk %}

    - {% trans "This comment has been removed." %} {% trans "You can edit the messages that haven't been sent below. - Changed your mind?" %} {% trans "Restore (unremove) this comment" %}. + {% trans "This comment has been removed." %} + {% trans "You can edit the messages that haven't been sent below. Changed your mind?" %} {% trans "Restore (unremove) this comment" %}.

    {% else %} -

    {% trans "Remove the following comment by {{ comment.user.profile }}? (If this is spam, use this form instead)" %}

    +

    + {% url "comments.spam_can_comment" comment.pk as spam_comment_url %} + {% blocktrans with commenter=comment.user.profile %} + Remove the following comment by {{ commenter }}? (If this is spam, use this form instead)

    + {% endblocktrans %} {% endif %}

    posted {{ comment.created|date }} on @@ -107,8 +111,7 @@

    {% firstof form.post_author_message.label "Post author message" %}

    {% if form.post_author_message.errors %}

    - {% trans "There was an error with the message body below; we couldn't - compile it into a letter." %} + {% trans "There was an error with the message body below; we couldn't compile it into a letter." %}

    {% trans "The cryptic error message we got was:" %}

    {{ form.post_author_message.errors }}
    diff --git a/scanblog/templates/comments/unremove_comment.html b/scanblog/templates/comments/unremove_comment.html index c0ab1f5..caef5c9 100644 --- a/scanblog/templates/comments/unremove_comment.html +++ b/scanblog/templates/comments/unremove_comment.html @@ -7,7 +7,11 @@ {% block body %}

    {% trans "Unremove Comment" %}

    -

    {% trans "Restore the following comment, which was removed on {{ removal.date|date }}?" %}

    +

    +{% blocktrans with removal_date=removal.date|date %} +Restore the following comment, which was removed on {{ removal_date }}? +{% endblocktrans %} +

    posted {{ comment.created|date }} on {{ comment.document.get_title }} by diff --git a/scanblog/templates/lint.py b/scanblog/templates/lint.py index f0199c7..004e011 100644 --- a/scanblog/templates/lint.py +++ b/scanblog/templates/lint.py @@ -3,6 +3,8 @@ for root, dirs, files in os.walk(os.path.abspath(os.path.dirname(__file__))): for fn in files: + if fn.endswith(".swp"): + continue path = os.path.join(root, fn) with open(path) as fh: txt = fh.read() @@ -31,3 +33,9 @@ # Look for tabs if "\t" in txt: print "has tab characters", path + + # Look for blocks and variables inside {% trans "" %} tags + for match in re.finditer(r"""\{\% trans ((.(?!\%\}))*) \%\}""", txt): + if re.search("[\{\}]+", match.group(1)): + print "tags in trans", path + diff --git a/scanblog/templates/notification/notice_settings.html b/scanblog/templates/notification/notice_settings.html index 9bb710b..5220df1 100644 --- a/scanblog/templates/notification/notice_settings.html +++ b/scanblog/templates/notification/notice_settings.html @@ -63,7 +63,9 @@

    {% trans "Subscriptions" %}

    {% trans "Posts from the" %} {{ sub.campaign.title }} campaign {% endif %} {% if sub.affiliation_id %} - {% trans "Posts from the {{ sub.campaign.title }} campaign" %} + {% blocktrans with campaign_url=sub.campaign.get_absolute_url campaign_title=sub.campaign.title %} + Posts from the {{ campaign_title }} campaign + {% endblocktrans %} {% endif %} diff --git a/scanblog/templates/registration/activation_email.txt b/scanblog/templates/registration/activation_email.txt index f49d0fd..7e88907 100644 --- a/scanblog/templates/registration/activation_email.txt +++ b/scanblog/templates/registration/activation_email.txt @@ -1,17 +1,18 @@ {% load i18n %} -{% trans "Hello" %}, +{% blocktrans with site_name=site.name %} +Hello, -{% trans "Welcome to {{ site.name }}! You've just joined a community of respectful -people who value helping to give a voice to the voiceless." %} +Welcome to {{ site_name }}! You've just joined a community of respectful +people who value helping to give a voice to the voiceless. -{% trans "To complete your registration, follow this link:" %} +To complete your registration, follow this link: {{ base_url }}/accounts/activate/{{ activation_key }}/ -{% trans "This link will expire in {{ expiration_days }} days, so don't delay." %} +This link will expire in {{ expiration_days }} days, so don't delay. -{% trans "See you on {{ site.name }}! "%} +See you on {{ site_name }}! -{% trans "Sincerely" %}, +Sincerely, -{% trans "{{ site.name }} staff" %} +{{ site.name }} staff {{ base_url }} diff --git a/scanblog/templates/scanning/flag.html b/scanblog/templates/scanning/flag.html index 5254f5c..38b2d6e 100644 --- a/scanblog/templates/scanning/flag.html +++ b/scanblog/templates/scanning/flag.html @@ -3,7 +3,11 @@ {% block title %}Flag document{% endblock %} {% block body %}

    {% trans "Flag content" %}

    -

    {% trans "A flag lets moderators now that something is not right about a particular post, profile, or comment. Please help us by flagging any posts that seem to be against our guidelines, or have been improperly edited (for example, pages not rotated correctly)." %} +

    +{% url "about.guidelines" as about_guidelines_url %} +{% blocktrans %} +A flag lets moderators now that something is not right about a particular post, profile, or comment. Please help us by flagging any posts that seem to be against our guidelines, or have been improperly edited (for example, pages not rotated correctly). +{% endblocktrans %}

    {% csrf_token %} From 193ae0c0e5c3837ffd4af33fad61c226c6318fdf Mon Sep 17 00:00:00 2001 From: Charlie DeTar Date: Tue, 21 Oct 2014 19:59:23 -0600 Subject: [PATCH 53/53] Add site name back to ToU --- scanblog/templates/about/terms.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scanblog/templates/about/terms.html b/scanblog/templates/about/terms.html index f71ee82..d604f21 100644 --- a/scanblog/templates/about/terms.html +++ b/scanblog/templates/about/terms.html @@ -6,7 +6,7 @@

    {% blocktrans with site_name=site.name %} - Terms of Use + {{ site_name }} Terms of Use {% endblocktrans %}