Further fixes to profiles templates.

templates/sora/profiles/content_posts.html

@@ -8,11 +8,7 @@
 {% block title %}{{ macros.page_title(_('Posts'), profile.username) }}{% endblock %}
 
 {% block tab %}
-<<<<<<< HEAD
-<h2>{% trans username=profile.username %}{{ username }}'s Posts{% endtrans %}{% if items_total %} <small>
-=======
 <h2>{% trans username=profile.username %}{{ username }}'s posts{% endtrans %}{% if items_total %} <small>
->>>>>>> Fixes in new templates.
     {%- trans count=items_total, total=items_total|intcomma, username=profile.username -%}
     {{ username }} has one post
     {%- pluralize -%}

templates/sora/profiles/content_threads.html

@@ -8,11 +8,7 @@
 {% block title %}{{ macros.page_title(_('Threads'), profile.username) }}{% endblock %}
 
 {% block tab %}
-<<<<<<< HEAD
-<h2>{% trans username=profile.username %}{{ username }}'s Threads{% endtrans %}{% if items_total %} <small>
-=======
 <h2>{% trans username=profile.username %}{{ username }}'s threads{% endtrans %}{% if items_total %} <small>
->>>>>>> Fixes in new templates.
     {%- trans count=items_total, total=items_total|intcomma, username=profile.username -%}
     {{ username }} started one thread
     {%- pluralize -%}

templates/sora/profiles/followers.html

@@ -8,11 +8,7 @@
 {% block title %}{{ macros.page_title(_('Followers'), profile.username) }}{% endblock %}
 
 {% block tab %}
-<<<<<<< HEAD
-<h2>{% trans username=profile.username %}{{ username }}'s Followers{% endtrans %}{% if items_total %} <small>
-=======
 <h2>{% trans username=profile.username %}{{ username }}'s followers{% endtrans %}{% if items_total %} <small>
->>>>>>> Fixes in new templates.
     {%- trans count=items_total, total=items_total|intcomma, username=profile.username -%}
     {{ username }} has one follower
     {%- pluralize -%}
@@ -27,9 +23,9 @@
   <thead>
     <tr>
       <th colspan="4">{% trans count=items_total, total=items_total|intcomma, username=profile.username -%}
-    {{ username }} has one follower at this time
+    {{ username }} has one follower
     {%- pluralize -%}
-    {{ username }} has {{ total }} followers at this time
+    {{ username }} has {{ total }} followers
     {%- endtrans %}</th>
     </tr>
   </thead>

templates/sora/profiles/follows.html

@@ -8,11 +8,7 @@
 {% block title %}{{ macros.page_title(_('Follows'), profile.username) }}{% endblock %}
 
 {% block tab %}
-<<<<<<< HEAD
-<h2>{% trans username=profile.username %}Who {{ username }} Follows{% endtrans %}{% if items_total %} <small>
-=======
 <h2>{% trans username=profile.username %}Who {{ username }} follows{% endtrans %}{% if items_total %} <small>
->>>>>>> Fixes in new templates.
     {%- trans count=items_total, total=items_total|intcomma, username=profile.username -%}
     {{ username }} follows one member
     {%- pluralize -%}
@@ -53,7 +49,7 @@
   {{ pager() }}
 </div>
 {% else %}
-<p class="lead">{% trans username=profile.username %}{{ username }} follows nobody  at this time{% endtrans %}</p>
+<p class="lead">{% trans username=profile.username %}{{ username }} follows nobody at this time{% endtrans %}</p>
 {% endif %}
 {% endblock %}