Merge pull request #1100 from kawazrepos/plug/i18n

Viewのみに関係する英語の間違いを修正

src/templates/base.html

@@ -84,29 +84,29 @@
                             <li><a href="{% url "blogs_entry_author_list" author=user.username %}"><span class="glyphicon glyphicon-file"></span>{% trans "My entries" %}</a></li>
                             <li><a href="/drafts"><span class="glyphicon glyphicon-inbox"></span>{% trans "Manage drafts" %}</a></li>
                             <li role="presentation" class="divider"></li>
-                            <li><a href="{% url "personas_profile_update" %}"><span class="glyphicon glyphicon-pencil"></span>{% trans "Change profile" %}</a></li>
-                            <li><a href="{% url "personas_persona_update" %}"><span class="glyphicon glyphicon-user"></span>{% trans "Change user information" %}</a></li>
+                            <li><a href="{% url "personas_profile_update" %}"><span class="glyphicon glyphicon-pencil"></span>{% trans "Edit profile" %}</a></li>
+                            <li><a href="{% url "personas_persona_update" %}"><span class="glyphicon glyphicon-user"></span>{% trans "Edit user information" %}</a></li>
                             <li><a href="{% url "password_change" %}"><span class="glyphicon glyphicon-wrench"></span>{% trans "Change password" %}</a></li>
                             {% if user.is_staff or user.is_superuser %}
                                 <li role="presentation" class="divider"></li>
                             {% endif %}
                             {% if user.is_staff %}
                                 <li><a href="/central-dogma/" target="_blank"><span class="glyphicon glyphicon-cog"></span>{% trans "Central Dogma" %}</a></li>
-                                <li><a href=https://www.google.com/analytics/reporting/?reset=1&amp;id=38943028" target="_blank"><span class="glyphicon glyphicon-stats"></span>{% trans "Marduk institute" %}</a></li>
+                                <li><a href=https://www.google.com/analytics/reporting/?reset=1&amp;id=38943028" target="_blank"><span class="glyphicon glyphicon-stats"></span>{% trans "Marduk Institute" %}</a></li>
                             {% endif %}
                             {% if user has 'personas.assign_role_persona' %}
                                 {% if user.is_superuser %}
                                     <li>
                                         <a class="post-link"
                                            href="{% url "personas_persona_assign_seele" %}">
-                                            <span class="glyphicon glyphicon-tower"></span>{% trans "Demote to 'seele'" %}
+                                            <span class="glyphicon glyphicon-tower"></span>{% trans "Demote to 'Seele'" %}
                                             <form method="POST" style="display: none;">{% csrf_token %}</form>
                                         </a>
                                     </li>
                                 {% else %}
                                     <li>
                                         <a class="post-link"
-                                           confirm-message="{% trans "!CAUTION! Promoting to 'Adam' is strongly not recommended while you will have any permissions to any objects in this system. It means that you potentially cause critical damages on the system. Are you sure to promote?" %}"
+                                           confirm-message="{% trans "!CAUTION! Promoting to 'Adam' is strongly not recommended, for you will have ANY permissions to ANY objects in this system, which means you potentially cause critical damages on the system. Are you sure you want to promote?" %}"
                                            href="{% url "personas_persona_assign_adam" %}">
                                             <span class="glyphicon glyphicon-tower"></span>{% trans "Promote to 'Adam'" %}
                                             <form method="POST" style="display: none;">{% csrf_token %}</form>
@@ -115,13 +115,13 @@
                                 {% endif %}
                             {% endif %}
                             <li role="presentation" class="divider"></li>
-                            <li><a class="logout-link" href="{% url "logout" %}?next={{ request.path }}"><span class="glyphicon glyphicon-log-out"></span>{% trans "Logout" %}</a></li>
+                            <li><a class="logout-link" href="{% url "logout" %}?next={{ request.path }}"><span class="glyphicon glyphicon-log-out"></span>{% trans "Log out" %}</a></li>
                         </ul>
                     </div>
                 {% else %}
                     <div class="btn-group">
                         <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
-                            {% trans "Login" %} <b class="caret"></b>
+                            {% trans "Log in" %} <b class="caret"></b>
                         </button>
                         <ul class="dropdown-menu anonymous-menu" role="menu">
                             {% include "components/login_form.html" %}

src/templates/blogs/entry_detail.html

@@ -61,11 +61,11 @@ <h2 class="panel-title">{% trans "Administration" %}</h2>
           </div>
           <div class="list-group">
               {% if user has 'blogs.change_entry' of object %}
-            <a class="list-group-item" href="{% url 'blogs_entry_update' author=user.username pk=object.pk %}"><span class="glyphicon glyphicon-pencil"></span> {% trans "Edit the blog entry" %}</a>
+            <a class="list-group-item" href="{% url 'blogs_entry_update' author=user.username pk=object.pk %}"><span class="glyphicon glyphicon-pencil"></span> {% trans "Edit this blog entry" %}</a>
                 {% endif %}
                 {% if user has 'blogs.delete_entry' of object %}
                 <a class="list-group-item list-group-item-danger post-link" href="{% url 'blogs_entry_delete' author=user.username pk=object.pk %}" confirm-message="{% trans "Do you want to delete this entry?" %}"><span class="glyphicon glyphicon-remove"></span>
-                    {% trans "Delete the blog entry" %}
+                    {% trans "Delete this blog entry" %}
                     <form method="POST" style="display: none;">{% csrf_token %}</form>
                 </a>
                 {% endif %}

src/templates/blogs/entry_list.html

@@ -33,7 +33,7 @@ <h1>{% trans "Blog entries" %}</h1>
 
         {% if paginator.count == 0 %}
         <div class="alert alert-warning">
-            {% trans "There are no blog entries." %}
+            {% trans "There are no drafts of blog entries." %}
         </div>
         {% endif %}
     </div>

src/templates/comments/components/comment_form.html

@@ -16,6 +16,6 @@
     </div>
 {% else %}
     <div class="alert alert-warning">
-        {% trans "Participants are only allowed to comment on the entry. Please login to comment." %}
+        {% trans "Only registered users are allowed to comment on the entry. Please log in to comment." %}
     </div>
 {% endif %}

src/templates/comments/components/comment_items.html

@@ -39,7 +39,7 @@
             </header>
             <div class="comment-body comment-body">
                 {% if comment.is_removed %}
-                    <span class="comment-deleted">{% trans "This comment have been deleted." %}</span>
+                    <span class="comment-deleted">{% trans "This comment has been deleted." %}</span>
                 {% else %}
                     {% if comment.user.is_authenticated %}
                         {# ログインユーザーはmarkdownを使える #}

src/templates/components/login_form.html

@@ -15,7 +15,7 @@
             </div>
         </div>
         <div class="col-lg-6">
-            <button type="submit" class="btn btn-success">{% trans "Login" %}</button>
+            <button type="submit" class="btn btn-success">{% trans "Log in" %}</button>
         </div>
         <div class="col-lg-6 forgot-password">
             <a href="{% url "password_reset" %}">{% trans "Forgot your password?" %}</a>

src/templates/events/event_archive_month.html

@@ -39,7 +39,7 @@ <h1>{% blocktrans with month=month|date:"Y年n月" %}Events on {{ month }}{% end
             {% include "events/components/list-item.html" %}
         {% empty %}
             <div class="alert alert-info">
-                <p>{% trans "Matching events can not be found" %}</p>
+                <p>{% trans "No events found" %}</p>
                 {% if user has 'events.add_event' %}
                     <a href="{% url "events_event_create" %}" class="btn btn-success"><span class="glyphicon glyphicon-plus"></span> {% trans "Create a new event" %}</a>
                 {% endif %}

src/templates/events/event_archive_year.html

@@ -39,7 +39,7 @@ <h1>{% blocktrans with year=year|date:"Y" %}Events on {{ year }}{% endblocktrans
             {% include "events/components/list-item.html" %}
         {% empty %}
             <div class="alert alert-info">
-                <p>{% trans "Matching events can not be found" %}</p>
+                <p>{% trans "No events found" %}</p>
                 {% if user has 'events.add_event' %}
                     <a href="{% url "events_event_create" %}" class="btn btn-success"><span class="glyphicon glyphicon-plus"></span> {% trans "Create a new event" %}</a>
                 {% endif %}

src/templates/events/event_detail.html

@@ -88,7 +88,7 @@ <h2>{{ event.title }}</h2>
                 {% if not event.is_active %}
                 {# イベントがすでに終了している #}
                     <p class="event-closed event-status">
-                    {% trans "This event already has been closed." %}
+                    {% trans "Event Ended" %}
                     </p>
 
                 {% elif user has 'events.attend_event' of event %}
@@ -98,7 +98,7 @@ <h2>{{ event.title }}</h2>
                     <a href="{% url "events_event_attend" event.pk %}"
                        class="btn btn-success btn-large btn-lg post-link">
                         <span class="glyphicon glyphicon-plus"></span>
-                        <span>{% trans "Attend this event" %}</span>
+                        <span>{% trans "Join Event" %}</span>
                         <form method="POST" style="display: none;">{% csrf_token %}</form>
                     </a>
                     {% if event.number_restriction %}
@@ -113,10 +113,10 @@ <h2>{{ event.title }}</h2>
                     {# イベント管理者向け #}
                     {% if event.is_over_restriction or event.is_over_deadline %}
                         {# 参加者を締め切った #}
-                        <p class="event-closed event-status">{% trans "The participation has been closed" %}</p>
+                        <p class="event-closed event-status">{% trans "Application Closed" %}</p>
                     {% else %}
                         {# 参加者募集中 #}
-                        <p class="event-recruit event-status">{% trans "Call for participats" %}</p>
+                        <p class="event-recruit event-status">{% trans "Application Open" %}</p>
                         {% if event.number_restriction %}
                         {% spaceless %}
                           <p class="event-join-count">
@@ -132,31 +132,31 @@ <h2>{{ event.title }}</h2>
                     {# イベントから抜ける #}
                     <a href="{% url "events_event_quit" event.pk %}"
                        class="btn btn-danger btn-large btn-lg post-link">
-                        <span class="glyphicon glyphicon-log-out event-attend-icon"></span><span>{% trans "Withdraw from the event" %}</span>
+                        <span class="glyphicon glyphicon-log-out event-attend-icon"></span><span>{% trans "Cancel Participation" %}</span>
                         <form method="POST" style="display: none;">{% csrf_token %}</form>
                     </a>
 
                 {% else %}
                     {% if event.is_over_restriction or event.is_over_deadline %}
                         {# 参加を締め切った #}
-                        <p class="event-closed event-status">{% trans "The participation has been closed" %}</p>
+                        <p class="event-closed event-status">{% trans "Application Closed" %}</p>
                     {% else %}
                         {# 外部ユーザ向け #}
                         {# イベントへの参加にはログインする必要がある #}
-                        <p class="event-outside event-status">{% trans "You need to login to join the event." %}</p>
+                        <p class="event-outside event-status">{% trans "Log in to Join" %}</p>
                     {% endif %}
 
                 {% endif %}
 
                 {% if event.attendance_deadline %}
                     <dl>
-                        <dt class="attendance-deadline">{% trans "Participation deadline" %}</dt>
+                        <dt class="attendance-deadline">{% trans "Application deadline" %}</dt>
                         <dd class="attendance-deadline">
                             <span>{{ event.attendance_deadline | date:"Y年m月d日" }}{% trans "utill" %}</span>
                         </dd>
                     </dl>
                 {% else %}
-                    <p class="attendance-deadline">{% trans "No participation deadline" %}</p>
+                    <p class="attendance-deadline">{% trans "No deadline for application" %}</p>
                 {% endif %}
             </div>
         </div>
@@ -168,7 +168,7 @@ <h2>{{ event.title }}</h2>
 {% block content-main %}
     {% if not object.is_active %}
         <div class="alert alert-warning">
-            {% trans "This event already has been closed." %}
+            {% trans "Event Ended" %}
         </div>
     {% endif %}
     <article class="markdown">
@@ -229,7 +229,7 @@ <h2 class="panel-title">{% trans "Administration" %}</h2>
                 {% if user has 'events.change_event' of object %}
                     <a class="list-group-item"
                        href="{% url "events_event_update" object.pk %}"><span
-                            class="glyphicon glyphicon-pencil"></span> {% trans "Update the event" %}
+                            class="glyphicon glyphicon-pencil"></span> {% trans "Edit the event" %}
                     </a>
                 {% endif %}
                 {% if user has 'events.delete_event' of object %}

src/templates/events/event_list.html

@@ -39,7 +39,7 @@ <h1>{% trans "Upcoming events" %}</h1>
             {% include "events/components/list-item.html" %}
         {% empty %}
             <div class="alert alert-info">
-                <p>{% trans "Matching events can not be found" %}</p>
+                <p>{% trans "No events found" %}</p>
                 {% if user has 'events.add_event' %}
                     <a href="{% url "events_event_create" %}" class="btn btn-success"><span class="glyphicon glyphicon-plus"></span> {% trans "Create a new event" %}</a>
                 {% endif %}
@@ -76,4 +76,3 @@ <h3 class="panel-title">{% trans "Event archives" %}</h3>
         </div>
     </div>
 {% endblock %}
-

src/templates/personas/persona_detail.html

@@ -7,7 +7,7 @@
 {% load strip_newlines %}
 {% block twittercard_title %}{% blocktrans with nickname=object.nickname %}{{ nickname }}'s Profile{% endblocktrans %}{% endblock %}
 {# 以下の行をインデント処理していないのはtwitter:descriptionのcontentに無用な改行が入るのを防ぐため #}
-{% block twittercard_description %}{% if not profile and not user.is_authenticated %}{% blocktrans with nickname=object.nickname %}{{ nickname }} may conceal own profile from non participants. Please login to see the profile.{% endblocktrans %}{% else %}{{ profile.remarks | kfm | striptags | strip_newlines:" " | truncatechars:200 }}{% endif %}{% endblock %}
+{% block twittercard_description %}{% if not profile and not user.is_authenticated %}{% blocktrans with nickname=object.nickname %}{{ nickname }} is keeping the profile secret from non participants. Please login to see the profile.{% endblocktrans %}{% else %}{{ profile.remarks | kfm | striptags | strip_newlines:" " | truncatechars:200 }}{% endif %}{% endblock %}
 {% block title %}{% blocktrans with nickname=object.nickname %}{{ nickname }}'s Profile{% endblocktrans %}{% endblock %}
 {% block pre_css %}
     {{ block.super }}
@@ -22,7 +22,7 @@
     {% get_current_site as site %}
     <meta property="og:title" content="{{ object.nickname | truncatechars:70 }}" />
     <meta property="og:type" content="article" />
-    <meta property="og:description" content="{% if not profile and not user.is_authenticated %}{% blocktrans with nickname=object.nickname %}{{ nickname }} may conceal own profile from non participants. Please login to see the profile.{% endblocktrans %}{% else %}{{ profile.remarks | kfm | striptags | strip_newlines:" " | truncatechars:200 }}{% endif %}">
+    <meta property="og:description" content="{% if not profile and not user.is_authenticated %}{% blocktrans with nickname=object.nickname %}{{ nickname }} is keeping the profile secret from non participants. Please login to see the profile.{% endblocktrans %}{% else %}{{ profile.remarks | kfm | striptags | strip_newlines:" " | truncatechars:200 }}{% endif %}">
     <meta property="og:image" content="http://{{ site.domain }}{{ object.get_large_avatar }}" />
 {% endblock %}
 {% block content-main %}
@@ -89,7 +89,7 @@ <h1>{{ object.nickname }}</h1>
         {# プロフィールが渡されていないとき、すなわち非公開の時 #}
         <div class="alert alert-warning">
             <p>
-                {% blocktrans with nickname=object.nickname %}{{ nickname }} may conceal own profile from non participants. Please login to see the profile.{% endblocktrans %}
+                {% blocktrans with nickname=object.nickname %}{{ nickname }} is keeping the profile secret from non participants. Please login to see the profile.{% endblocktrans %}
             </p>
         </div>
     {% endif %}
@@ -200,7 +200,7 @@ <h2 class="panel-title">{% trans "Joined Projects" %}</h2>
                         </div>
                     </a>
                 {% empty %}
-                    <li class="list-group-item list-group-item-warning">{% trans "There are no joinned projects." %}</li>
+                    <li class="list-group-item list-group-item-warning">{% trans "There are no joined projects." %}</li>
                 {% endfor %}
             </div>
         </div>

src/templates/personas/persona_form.html

@@ -3,16 +3,16 @@
 {% load crispy_forms_tags %}
 {% load form_helper %}
 
-{% block title %}{% trans "Change your user information" %}{% endblock %}
+{% block title %}{% trans "Edit your user information" %}{% endblock %}
 {% block content %}
     <ol class="breadcrumb">
         {% block breadcrumb %}
             <li><a href="/">Home</a></li>
-            <li><a href="{% url "personas_persona_update" %}">{% trans "Change user information" %}</a></li>
+            <li><a href="{% url "personas_persona_update" %}">{% trans "Edit user information" %}</a></li>
         {% endblock %}
     </ol>
     <div class="page-header">
-        <h1>{% trans "Change your user information" %}</h1>
+        <h1>{% trans "Edit your user information" %}</h1>
     </div>
     <p>プロフィールは<a href="{% url "personas_profile_update" %}">プロフィールの変更</a>ページから変更できます</p>
     <form class="form-horizontal row" role="form" method="POST" action="?next={{ redirect_to }}" enctype="multipart/form-data">{% csrf_token %}