Issue 2136 - Update web.adblockplus.org content for specifying default translations inline

includes/subscriptionList.tmpl

Index: includes/subscriptionList.tmpl
===================================================================
--- a/includes/subscriptionList.tmpl
+++ b/includes/subscriptionList.tmpl
@@ -21,40 +21,40 @@
       <td rowspan="2" class="dummy"></td>
       <td rowspan="2">
     {%- else %}
       <td rowspan="2" colspan="2">
     {%- endif %}
       <strong class="subscriptionTitle">{{ subscription["name"] }}</strong><br>
       {{ subscription["specialization"] }}
       {%- if subscription["supplements"] %}
-      <br>{{ "supplements_prefix"|translate }} {{ ' / '.join(subscription["supplements"]) }} {{ "supplements_suffix"|translate }}
+      <br>{{ "supplement for"|translate("supplements_prefix") }} {{ ' / '.join(subscription["supplements"]) }} {{ ""|translate("supplements_suffix") }}
       {%- endif %}
     </td>
     <td>
       {%- if subscription["maintainer"] %}
-      {{ "maintainer_prefix"|translate }} {{ subscription["maintainer"] }} {{ "maintainer_suffix"|translate }}<br>
+      {{ "by"|translate("maintainer_prefix") }} {{ subscription["maintainer"] }} {{ ""|translate("maintainer_suffix") }}<br>
       {%- endif %}
       {%- set is_first = True %}
-      {% for key in ('homepage', 'forum', 'contact', 'faq', 'blog', 'changelog', 'policy') -%}
+      {% for key, default in (('homepage', 'Homepage'), ('forum', 'Forum'), ('contact', 'Contact page'), ('faq', 'FAQ'), ('blog', 'Blog'), ('changelog', 'Changelog'), ('policy', 'Policy')) -%}
         {%- set url = subscription[key] -%}
         {%- if url -%}
           {%- if not is_first %}, {% endif -%}
           {%- set is_first = False -%}
-          <a href="{{ url }}">{{ key|translate }}</a>
+          <a href="{{ url }}">{{ default|translate(key) }}</a>
         {%- endif %}
       {%- endfor %}
     </td>
   </tr>
   <tr{% if subscription["deprecated"] %} class="deprecated"{% endif %}>
     <td>
       {%- if subscription["deprecated"] %}
-      <strong>{{ "deprecation_warning"|translate }}</strong><br>
+      <strong>{{ "Note: This list is not optimized for Adblock Plus and may slow down your browsing experience."|translate("deprecation_warning") }}</strong><br>
       {%- endif %}
-      {{ "subscribe"|translate }}{{ ' ' }}
+      {{ "Subscribe:"|translate("subscribe") }}{{ ' ' }}
       {%- for title, url, complete in subscription["variants"] -%}
         <a href="abp:subscribe?location={{ url|urlencode }}&amp;title={{ title|urlencode }}
           {%- if parent and not complete -%}
             {%- set main_title, main_url, main_complete = parent.variants[0] -%}
             &amp;requiresLocation={{ main_url|urlencode }}&amp;requiresTitle={{ main_title|urlencode }}
           {%- endif -%}
         ">{{ title }}</a>{%- if not loop.last %}, {% endif -%}
       {%- endfor %}
@@ -64,26 +64,26 @@
     {%- for supplement in subscription["supplemented"]|subscription_sort -%}
       {{ process_subscription(supplement, subscription) }}
     {%- endfor -%}
   {%- endif -%}
 {%- endmacro %}
 
 {% macro display_subscriptions(subscriptions) %}
   {%- set current_type = subscriptions[0]["type"] -%}
-  <h2>{{ ("type_" + current_type)|translate }}</h2>
+  <h2>{{ get_string("type_" + current_type, "subscriptions") }}</h2>
 
   <table class="subscriptions">
   {%- for subscription in subscriptions|subscription_sort -%}
     {%- if not subscription["supplements"] -%}
       {%- if current_type != subscription["type"] -%}
         {%- set current_type = subscription["type"] %}
   </table>
 
-  <h2>{{ ("type_" + current_type)|translate }}</h2>
+  <h2>{{ get_string("type_" + current_type, "subscriptions") }}</h2>
 
   <table class="subscriptions">
       {%- endif -%}
       {{ process_subscription(subscription) }}
     {%- endif -%}
   {%- endfor %}
   </table>
 {% endmacro %}