Merge "i18n: Do not include html directives in translation strings"

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/associate-ip/modal.html

@@ -9,8 +9,8 @@
     <div class="row">
       <div class="col-sm-12 col-md-6">
         <div class="form-group required">
-          <label translate class="control-label" for="floating-ip">
+          <label class="control-label" for="floating-ip">
-            Floating IP address or pool
+            <translate>Floating IP address or pool</translate>
             <span class="hz-icon-required fa fa-asterisk"></span>
           </label>
           <select class="form-control" name="floating-ip" id="floating-ip"

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/members/actions/edit-weight/modal.html

@@ -10,8 +10,8 @@
       <div class="col-sm-12 col-md-6">
         <div class="form-group required"
              ng-class="{ 'has-error': form.weight.$invalid && form.weight.$dirty }">
-          <label translate class="control-label" for="weight">
+          <label class="control-label" for="weight">
-            Weight
+            <translate>Weight</translate>
             <span class="hz-icon-required fa fa-asterisk"></span>
           </label>
           <input name="weight" id="weight" type="number" class="form-control"

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/certificates/certificates.help.html

@@ -2,18 +2,20 @@
   If the listener uses the TERMINATED_HTTPS protocol, then one or more SSL certificates must
   be selected. The first certificate will be the default.
 </p>
-<p translate>
+<p>
+  <translate>
   Use the key-manager service to create any certificate containers before creating the listener.
   The following documentation provides information on how to create a certificate container:
+  </translate>
   <ul>
     <li>
       <a target="_blank" href="http://developer.openstack.org/api-guide/key-manager/containers.html#certificate-containers">
-        Key Manager API Guide: Creating a Certificate Container
+        <translate>Key Manager API Guide: Creating a Certificate Container</translate>
       </a>
     </li>
     <li>
       <a target="_blank" href="http://docs.openstack.org/cli-reference/barbican.html">
-        Key Manager Service Command-Line Client
+        <translate>Key Manager Service Command-Line Client</translate>
       </a>
     </li>
   </ul>

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/listener/listener.help.html

@@ -3,13 +3,17 @@
   tied to the load balancer. Multiple listeners can be associated with the same load balancer but
   each must use a unique port.
 </p>
-<p translate>
+<p>
-  <strong>Protocol:</strong>
+  <strong translate>Protocol:</strong>
+  <translate>
   The protocol for which the front end listens. The TERMINATED_HTTPS protocol is only available if
   the key-manager service is enabled and you have authority to list certificate containers and
   secrets.
+  </translate>
 </p>
-<p translate>
+<p>
-  <strong>Port:</strong>
+  <strong translate>Port:</strong>
+  <translate>
   The port on which the front end listens. Must be an integer from 1 to 65535.
+  </translate>
 </p>

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/listener/listener.html

@@ -25,8 +25,8 @@
 
     <div class="col-xs-12 col-sm-8 col-md-6">
       <div class="form-group required">
-        <label translate class="control-label" for="protocol">
+        <label class="control-label" for="protocol">
-          Protocol
+          <translate>Protocol</translate>
           <span class="hz-icon-required fa fa-asterisk"></span>
         </label>
         <select class="form-control" name="protocol" id="protocol"
@@ -42,8 +42,8 @@
     <div class="col-xs-12 col-sm-8 col-md-6">
       <div class="form-group required"
            ng-class="{ 'has-error': listenerDetailsForm.port.$invalid && listenerDetailsForm.port.$dirty }">
-        <label translate class="control-label" for="port">
+        <label class="control-label" for="port">
-          Port
+          <translate>Port</translate>
           <span class="hz-icon-required fa fa-asterisk"></span>
         </label>
         <input name="port" id="port" type="number" class="form-control"

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/loadbalancer/loadbalancer.help.html

@@ -1,13 +1,17 @@
 <p translate>
   The load balancer occupies a neutron network port and has an IP address assigned from a subnet.
 </p>
-<p translate>
+<p>
-  <strong>IP address:</strong>
+  <strong translate>IP address:</strong>
+  <translate>
   If an IP address is provided it must be a well-formed IPv4 or IPv6 address. The system will
   attempt to assign the provided IP address to the load balancer. If an IP address is not provided
   then one will be allocated for you.
+  </translate>
 </p>
-<p translate>
+<p>
-  <strong>Subnet:</strong>
+  <strong translate>Subnet:</strong>
+  <translate>
   The network on which to allocate the load balancer's IP address.
+  </translate>
 </p>

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/loadbalancer/loadbalancer.html

@@ -38,8 +38,8 @@
 
     <div class="col-xs-12 col-sm-8 col-md-6">
       <div class="form-group required">
-        <label translate class="control-label" for="subnet">
+        <label class="control-label" for="subnet">
-          Subnet
+          <translate>Subnet</translate>
           <span class="hz-icon-required fa fa-asterisk"></span>
         </label>
         <select class="form-control" name="subnet" id="subnet"

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/members/members.help.html

@@ -7,22 +7,30 @@
   of the pool. Use the "Add external member" button to add a member not found in the Available
   Instances table.
 </p>
-<p translate>
+<p>
-  <strong>IP address:</strong>
+  <strong translate>IP address:</strong>
+  <translate>
   The IP address of the member to receive traffic from the load balancer. Must be a well-formed
   IPv4 or IPv6 address.
+  </translate>
 </p>
-<p translate>
+<p>
-  <strong>Subnet:</strong>
+  <strong translate>Subnet:</strong>
+  <translate>
   The network which contains the IP address of the member.
+  </translate>
 </p>
-<p translate>
+<p>
-  <strong>Port:</strong>
+  <strong translate>Port:</strong>
+  <translate>
   The port on which the member listens for traffic. Must be a number from 1 to 65535.
+  </translate>
 </p>
-<p translate>
+<p>
-  <strong>Weight:</strong>
+  <strong translate>Weight:</strong>
+  <translate>
   The weight of a member determines the portion of requests or connections it services compared
   to the other members of the pool. A higher weight means it will receive more traffic. Must be
   a number from 1 to 256.
+  </translate>
 </p>

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/members/members.html

@@ -11,16 +11,16 @@
              class="table table-striped table-rsp table-detail">
         <thead>
           <tr>
-            <th class="rsp-p1" translate>
+            <th class="rsp-p1">
-              IP Address
+              <translate>IP Address</translate>
-              <span class="hz-icon-required fa fa-asterisk" ng-show="ctrl.tableData.displayedAllocated.length > 0">
-            </th>
-            <th class="rsp-p1" translate>
-              Subnet
               <span class="hz-icon-required fa fa-asterisk" ng-show="ctrl.tableData.displayedAllocated.length > 0">
             </th>
             <th class="rsp-p1">
-              Port
+              <translate>Subnet</translate>
+              <span class="hz-icon-required fa fa-asterisk" ng-show="ctrl.tableData.displayedAllocated.length > 0">
+            </th>
+            <th class="rsp-p1">
+              <translate>Port</translate>
               <span class="hz-icon-required fa fa-asterisk" ng-show="ctrl.tableData.displayedAllocated.length > 0">
             </th>
             <th class="rsp-p1" translate>Weight</th>

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/monitor/monitor.help.html

@@ -4,30 +4,42 @@
   to determine if the member receives new connections. Each pool can only have one health
   monitor.
 </p>
-<p translate>
+<p>
-  <strong>Interval:</strong>
+  <strong translate>Interval:</strong>
+  <translate>
   The interval between health checks. Must be greater than or equal to the timeout.
+  </translate>
 </p>
-<p translate>
+<p>
-  <strong>Retries:</strong>
+  <strong translate>Retries:</strong>
+  <translate>
   The number of allowed connection failures before marking the member as inactive. Must be a
   number from 1 to 10.
+  </translate>
 </p>
-<p translate>
+<p>
-  <strong>Timeout:</strong>
+  <strong translate>Timeout:</strong>
+  <translate>
   The time after which a health check times out. Must be a number greater than or equal to 0
   and less than or equal to the interval.
+  </translate>
 </p>
-<p translate>
+<p>
-  <strong>HTTP method:</strong>
+  <strong translate>HTTP method:</strong>
+  <translate>
   The HTTP method used to perform the health check.
+  </translate>
 </p>
-<p translate>
+<p>
-  <strong>Expected status codes:</strong>
+  <strong translate>Expected status codes:</strong>
+  <translate>
   The expected HTTP status codes to get from a successful health check. Must be a single number,
   a comma separated list of numbers, or a range (two numbers separated by a hyphen).
+  </translate>
 </p>
-<p translate>
+<p>
-  <strong>URL path:</strong>
+  <strong translate>URL path:</strong>
+  <translate>
   The target of the health check HTTP request to the member. Must be a valid URL path.
+  </translate>
 </p>

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/monitor/monitor.html

@@ -5,8 +5,8 @@
 
     <div class="col-xs-12 col-sm-8 col-md-6 col-lg-4">
       <div class="form-group required">
-        <label translate class="control-label" for="type">
+        <label class="control-label" for="type">
-          Monitor type
+          <translate>Monitor type</translate>
           <span class="hz-icon-required fa fa-asterisk"></span>
         </label>
         <select class="form-control" name="type" id="type"
@@ -24,8 +24,8 @@
     <div class="col-xs-12 col-sm-8 col-md-6 col-lg-4">
       <div class="form-group required"
            ng-class="{ 'has-error': monitorDetailsForm.interval.$invalid && monitorDetailsForm.interval.$dirty }">
-        <label translate class="control-label" for="interval">
+        <label class="control-label" for="interval">
-          Interval (sec)
+          <translate>Interval (sec)</translate>
           <span class="hz-icon-required fa fa-asterisk"></span>
         </label>
         <input name="interval" id="interval" type="number" class="form-control"
@@ -40,8 +40,8 @@
     <div class="col-xs-12 col-sm-8 col-md-6 col-lg-4">
       <div class="form-group required"
            ng-class="{ 'has-error': monitorDetailsForm.retry.$invalid && monitorDetailsForm.retry.$dirty }">
-        <label translate class="control-label" for="retry">
+        <label class="control-label" for="retry">
-          Retries
+          <translate>Retries</translate>
           <span class="hz-icon-required fa fa-asterisk"></span>
         </label>
         <input name="retry" id="retry" type="number" class="form-control"
@@ -56,8 +56,8 @@
     <div class="col-xs-12 col-sm-8 col-md-6 col-lg-4">
       <div class="form-group required"
            ng-class="{ 'has-error': monitorDetailsForm.timeout.$invalid && monitorDetailsForm.timeout.$dirty }">
-        <label translate class="control-label" for="timeout">
+        <label class="control-label" for="timeout">
-          Timeout (sec)
+          <translate>Timeout (sec)</translate>
           <span class="hz-icon-required fa fa-asterisk"></span>
         </label>
         <input name="timeout" id="timeout" type="number" class="form-control"

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/pool/pool.help.html

@@ -1,18 +1,20 @@
 <p translate>
   A pool represents a group of members over which the load balancing will be applied.
 </p>
-<p translate>
+<p>
-  <strong>Method:</strong>
+  <strong translate>Method:</strong>
+  <translate>
   The load balancer algorithm that distributes traffic to the pool members.
+  </translate>
   <ul>
-    <li>
+    <li translate>
       LEAST_CONNECTIONS: Allocates requests to the instance with the least number of active
       connections.
     </li>
-    <li>
+    <li translate>
       ROUND_ROBIN: Rotates requests evenly between multiple instances.
     </li>
-    <li>
+    <li translate>
       SOURCE_IP: Requests from a unique source IP address are consistently directed to the same instance.
     </li>
   </ul>

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/workflow/pool/pool.html

@@ -25,8 +25,8 @@
 
     <div class="col-xs-12 col-sm-8 col-md-6">
       <div class="form-group required">
-        <label translate class="control-label" for="method">
+        <label class="control-label" for="method">
-          Method
+          <translate>Method</translate>
           <span class="hz-icon-required fa fa-asterisk"></span>
         </label>
         <select class="form-control" name="method" id="method"