From a1e770dc108bd101b79d5f9cf7de3238749556ff Mon Sep 17 00:00:00 2001 From: Aaron Sahlin Date: Tue, 30 Sep 2014 16:25:04 -0500 Subject: [PATCH] Add ':' inside translatable (Part 2 of 2) Punctuation needs to be included in translation since punctuation differs depending on the language. Along with moving ':' also replaced   with blank space insde trans or transblock tag.The initial review grew too large, so this patch has been broken into 2 reviews. Part 2 will cover the files in openstack_dashboard/dashboard/project while Part 1 coverered the rest. Change-Id: Ibf2036d5bbc4c478fcb912f6335104356e8f1317 Partially-Closes-Bug: #1369445 --- .../access_and_security/keypairs/_create.html | 2 +- .../access_and_security/keypairs/_import.html | 2 +- .../security_groups/_add_rule.html | 8 ++++---- .../access_and_security/security_groups/_create.html | 2 +- .../access_and_security/security_groups/_update.html | 2 +- .../containers/templates/containers/_copy.html | 4 ++-- .../containers/templates/containers/_create.html | 2 +- .../templates/containers/_create_pseudo_folder.html | 4 ++-- .../containers/templates/containers/_update.html | 6 +++--- .../containers/templates/containers/_upload.html | 10 ++++++---- .../data_processing.cluster_templates/_details.html | 2 +- .../_nodegroups_details.html | 4 ++-- .../cluster_node_groups_template.html | 2 +- .../templates/data_processing.clusters/_details.html | 6 ++++-- .../data_processing.clusters/_nodegroups_details.html | 4 ++-- .../data_processing.job_executions/_details.html | 2 +- .../_service_confs.html | 2 +- .../templates/instances/_decryptpassword.html | 2 +- .../templates/instances/_instance_flavor.html | 2 +- .../instances/templates/instances/_rebuild.html | 2 +- .../templates/loadbalancers/_vip_details.html | 11 ++++++++--- .../project/networks/templates/networks/_create.html | 2 +- .../networks/templates/networks/_detail_overview.html | 6 +++--- .../routers/templates/routers/_detail_overview.html | 6 ++++-- .../routers/extensions/routerrules/_create.html | 2 +- .../routers/extensions/routerrules/grid.html | 11 ++++++----- .../routers/templates/routers/ports/_create.html | 2 +- .../routers/templates/routers/ports/_setgateway.html | 2 +- .../stacks/templates/stacks/_change_template.html | 2 +- .../project/stacks/templates/stacks/_create.html | 2 +- .../stacks/templates/stacks/_detail_overview.html | 4 +++- .../stacks/templates/stacks/_resource_overview.html | 4 +++- .../stacks/templates/stacks/_select_template.html | 2 +- .../project/stacks/templates/stacks/_update.html | 2 +- .../templates/volumes/backups/_create_backup.html | 2 +- .../templates/volumes/backups/_detail_overview.html | 4 +++- .../templates/volumes/backups/_restore_backup.html | 2 +- .../templates/volumes/volumes/_extend_limits.html | 2 +- .../volumes/templates/volumes/volumes/_limits.html | 2 +- .../volumes/templates/volumes/volumes/_update.html | 2 +- .../templates/nexus1000v/_create_network_profile.html | 10 +++++----- 41 files changed, 85 insertions(+), 67 deletions(-) mode change 100644 => 100755 openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/keypairs/_create.html mode change 100644 => 100755 openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/keypairs/_import.html mode change 100644 => 100755 openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/security_groups/_add_rule.html mode change 100644 => 100755 openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/security_groups/_create.html mode change 100644 => 100755 openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/security_groups/_update.html mode change 100644 => 100755 openstack_dashboard/dashboards/project/containers/templates/containers/_copy.html mode change 100644 => 100755 openstack_dashboard/dashboards/project/containers/templates/containers/_create.html mode change 100644 => 100755 openstack_dashboard/dashboards/project/containers/templates/containers/_create_pseudo_folder.html mode change 100644 => 100755 openstack_dashboard/dashboards/project/containers/templates/containers/_update.html mode change 100644 => 100755 openstack_dashboard/dashboards/project/containers/templates/containers/_upload.html mode change 100644 => 100755 openstack_dashboard/dashboards/project/data_processing/cluster_templates/templates/data_processing.cluster_templates/_details.html mode change 100644 => 100755 openstack_dashboard/dashboards/project/data_processing/cluster_templates/templates/data_processing.cluster_templates/_nodegroups_details.html mode change 100644 => 100755 openstack_dashboard/dashboards/project/data_processing/cluster_templates/templates/data_processing.cluster_templates/cluster_node_groups_template.html mode change 100644 => 100755 openstack_dashboard/dashboards/project/data_processing/clusters/templates/data_processing.clusters/_details.html mode change 100644 => 100755 openstack_dashboard/dashboards/project/data_processing/clusters/templates/data_processing.clusters/_nodegroups_details.html mode change 100644 => 100755 openstack_dashboard/dashboards/project/data_processing/job_executions/templates/data_processing.job_executions/_details.html mode change 100644 => 100755 openstack_dashboard/dashboards/project/data_processing/nodegroup_templates/templates/data_processing.nodegroup_templates/_service_confs.html mode change 100644 => 100755 openstack_dashboard/dashboards/project/instances/templates/instances/_decryptpassword.html mode change 100644 => 100755 openstack_dashboard/dashboards/project/instances/templates/instances/_instance_flavor.html mode change 100644 => 100755 openstack_dashboard/dashboards/project/instances/templates/instances/_rebuild.html mode change 100644 => 100755 openstack_dashboard/dashboards/project/loadbalancers/templates/loadbalancers/_vip_details.html mode change 100644 => 100755 openstack_dashboard/dashboards/project/networks/templates/networks/_create.html mode change 100644 => 100755 openstack_dashboard/dashboards/project/networks/templates/networks/_detail_overview.html mode change 100644 => 100755 openstack_dashboard/dashboards/project/routers/templates/routers/_detail_overview.html mode change 100644 => 100755 openstack_dashboard/dashboards/project/routers/templates/routers/extensions/routerrules/_create.html mode change 100644 => 100755 openstack_dashboard/dashboards/project/routers/templates/routers/extensions/routerrules/grid.html mode change 100644 => 100755 openstack_dashboard/dashboards/project/routers/templates/routers/ports/_create.html mode change 100644 => 100755 openstack_dashboard/dashboards/project/routers/templates/routers/ports/_setgateway.html mode change 100644 => 100755 openstack_dashboard/dashboards/project/stacks/templates/stacks/_change_template.html mode change 100644 => 100755 openstack_dashboard/dashboards/project/stacks/templates/stacks/_create.html mode change 100644 => 100755 openstack_dashboard/dashboards/project/stacks/templates/stacks/_detail_overview.html mode change 100644 => 100755 openstack_dashboard/dashboards/project/stacks/templates/stacks/_resource_overview.html mode change 100644 => 100755 openstack_dashboard/dashboards/project/stacks/templates/stacks/_select_template.html mode change 100644 => 100755 openstack_dashboard/dashboards/project/stacks/templates/stacks/_update.html mode change 100644 => 100755 openstack_dashboard/dashboards/project/volumes/templates/volumes/backups/_create_backup.html mode change 100644 => 100755 openstack_dashboard/dashboards/project/volumes/templates/volumes/backups/_detail_overview.html mode change 100644 => 100755 openstack_dashboard/dashboards/project/volumes/templates/volumes/backups/_restore_backup.html mode change 100644 => 100755 openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/_extend_limits.html mode change 100644 => 100755 openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/_limits.html mode change 100644 => 100755 openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/_update.html mode change 100644 => 100755 openstack_dashboard/dashboards/router/nexus1000v/templates/nexus1000v/_create_network_profile.html diff --git a/openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/keypairs/_create.html b/openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/keypairs/_create.html old mode 100644 new mode 100755 index a1e8fcee36..134c36c348 --- a/openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/keypairs/_create.html +++ b/openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/keypairs/_create.html @@ -14,7 +14,7 @@
-

{% trans "Description" %}:

+

{% trans "Description:" %}

{% trans "Key pairs are ssh credentials which are injected into images when they are launched. Creating a new key pair registers the public key and downloads the private key (a .pem file)." %}

{% trans "Protect and use the key as you would any normal ssh private key." %}

diff --git a/openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/keypairs/_import.html b/openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/keypairs/_import.html old mode 100644 new mode 100755 index 9a3c627c83..10c82f6f1a --- a/openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/keypairs/_import.html +++ b/openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/keypairs/_import.html @@ -14,7 +14,7 @@
-

{% trans "Description" %}:

+

{% trans "Description:" %}

{% trans "Key Pairs are how you login to your instance after it is launched." %}

{% trans "Choose a key pair name you will recognise and paste your SSH public key into the space provided." %}

{% trans "SSH key pairs can be generated with the ssh-keygen command:" %}

diff --git a/openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/security_groups/_add_rule.html b/openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/security_groups/_add_rule.html old mode 100644 new mode 100755 index 174e81e1d5..637ee32757 --- a/openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/security_groups/_add_rule.html +++ b/openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/security_groups/_add_rule.html @@ -15,11 +15,11 @@
-

{% trans "Description" %}:

+

{% trans "Description:" %}

{% blocktrans %}Rules define which traffic is allowed to instances assigned to the security group. A security group rule consists of three main parts:{% endblocktrans %}

-

{% trans "Rule" %}: {% blocktrans %}You can specify the desired rule template or use custom rules, the options are Custom TCP Rule, Custom UDP Rule, or Custom ICMP Rule.{% endblocktrans %}

-

{% trans "Open Port/Port Range" %}: {% blocktrans %}For TCP and UDP rules you may choose to open either a single port or a range of ports. Selecting the "Port Range" option will provide you with space to provide both the starting and ending ports for the range. For ICMP rules you instead specify an ICMP type and code in the spaces provided.{% endblocktrans %}

-

{% trans "Remote" %}: {% blocktrans %}You must specify the source of the traffic to be allowed via this rule. You may do so either in the form of an IP address block (CIDR) or via a source group (Security Group). Selecting a security group as the source will allow any other instance in that security group access to any other instance via this rule.{% endblocktrans %}

+

{% trans "Rule:" %} {% blocktrans %}You can specify the desired rule template or use custom rules, the options are Custom TCP Rule, Custom UDP Rule, or Custom ICMP Rule.{% endblocktrans %}

+

{% trans "Open Port/Port Range:" %} {% blocktrans %}For TCP and UDP rules you may choose to open either a single port or a range of ports. Selecting the "Port Range" option will provide you with space to provide both the starting and ending ports for the range. For ICMP rules you instead specify an ICMP type and code in the spaces provided.{% endblocktrans %}

+

{% trans "Remote:" %} {% blocktrans %}You must specify the source of the traffic to be allowed via this rule. You may do so either in the form of an IP address block (CIDR) or via a source group (Security Group). Selecting a security group as the source will allow any other instance in that security group access to any other instance via this rule.{% endblocktrans %}

{% endblock %} diff --git a/openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/security_groups/_create.html b/openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/security_groups/_create.html old mode 100644 new mode 100755 index 3422b9d164..73483c602b --- a/openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/security_groups/_create.html +++ b/openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/security_groups/_create.html @@ -15,7 +15,7 @@
-

{% trans "Description" %}:

+

{% trans "Description:" %}

{% trans "Security groups are sets of IP filter rules that are applied to the network settings for the VM. After the security group is created, you can add rules to the security group." %}

{% endblock %} diff --git a/openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/security_groups/_update.html b/openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/security_groups/_update.html old mode 100644 new mode 100755 index 6eb8a7b39c..30c289eb75 --- a/openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/security_groups/_update.html +++ b/openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/security_groups/_update.html @@ -15,7 +15,7 @@
-

{% trans "Description" %}:

+

{% trans "Description:" %}

{% trans "Security groups are sets of IP filter rules that are applied to the network settings for the VM. Edit the security group to add and change the rules." %}

{% endblock %} diff --git a/openstack_dashboard/dashboards/project/containers/templates/containers/_copy.html b/openstack_dashboard/dashboards/project/containers/templates/containers/_copy.html old mode 100644 new mode 100755 index b1e2a97506..18824fe4f5 --- a/openstack_dashboard/dashboards/project/containers/templates/containers/_copy.html +++ b/openstack_dashboard/dashboards/project/containers/templates/containers/_copy.html @@ -5,7 +5,7 @@ {% block form_id %}copy_object_form{% endblock %} {% block form_action %}{% url 'horizon:project:containers:object_copy' container_name object_name %}{% endblock %} -{% block modal-header %}{% trans "Copy Object" %}: {{ object_name }}{% endblock %} +{% block modal-header %}{% blocktrans %}Copy Object: {{ object_name }}{% endblocktrans %}{% endblock %} {% block modal-body %}
@@ -14,7 +14,7 @@
-

{% trans "Description" %}:

+

{% trans "Description:" %}

{% trans "Make a new copy of an existing object to store in this or another container. You may additionally specify the path within the selected container where the new copy should be stored." %}

{% endblock %} diff --git a/openstack_dashboard/dashboards/project/containers/templates/containers/_create.html b/openstack_dashboard/dashboards/project/containers/templates/containers/_create.html old mode 100644 new mode 100755 index d2063d9ee0..6805530a5b --- a/openstack_dashboard/dashboards/project/containers/templates/containers/_create.html +++ b/openstack_dashboard/dashboards/project/containers/templates/containers/_create.html @@ -14,7 +14,7 @@
-

{% trans "Description" %}:

+

{% trans "Description:" %}

{% trans "A container is a storage compartment for your data and provides a way for you to organize your data. You can think of a container as a folder in Windows ® or a directory in UNIX ®. The primary difference between a container and these other file system concepts is that containers cannot be nested. You can, however, create an unlimited number of containers within your account. Data must be stored in a container so you must have at least one container defined in your account prior to uploading data." %}

{% trans "Note: A Public Container will allow anyone with the Public URL to gain access to your objects in the container." %}

diff --git a/openstack_dashboard/dashboards/project/containers/templates/containers/_create_pseudo_folder.html b/openstack_dashboard/dashboards/project/containers/templates/containers/_create_pseudo_folder.html old mode 100644 new mode 100755 index 4d27bf0a68..f3c19a379f --- a/openstack_dashboard/dashboards/project/containers/templates/containers/_create_pseudo_folder.html +++ b/openstack_dashboard/dashboards/project/containers/templates/containers/_create_pseudo_folder.html @@ -14,8 +14,8 @@
-

{% trans "Description" %}:

-

{% trans "Pseudo-folder" %}: {% trans "Within a container you can group your objects into pseudo-folders, which behave similarly to folders in your desktop operating system, with the exception that they are virtual collections defined by a common prefix on the object's name. A slash (/) character is used as the delimiter for pseudo-folders in the Object Store." %}

+

{% trans "Description: %}

+

{% trans "Pseudo-folder:" %} {% trans "Within a container you can group your objects into pseudo-folders, which behave similarly to folders in your desktop operating system, with the exception that they are virtual collections defined by a common prefix on the object's name. A slash (/) character is used as the delimiter for pseudo-folders in the Object Store." %}

{% endblock %} diff --git a/openstack_dashboard/dashboards/project/containers/templates/containers/_update.html b/openstack_dashboard/dashboards/project/containers/templates/containers/_update.html old mode 100644 new mode 100755 index 1b52cd1a70..70ddbdc040 --- a/openstack_dashboard/dashboards/project/containers/templates/containers/_update.html +++ b/openstack_dashboard/dashboards/project/containers/templates/containers/_update.html @@ -17,9 +17,9 @@
-

{% trans "Description" %}:

-

{% trans "Object" %}: {% trans "An object is the basic storage entity that represents a file you store in the OpenStack Object Storage system. When you upload data to OpenStack Object Storage, the data is stored as-is (no compression or encryption) and consists of a location (container), the object's name, and any metadata consisting of key/value pairs." %}

-

{% trans "File" %}: {% trans "A new uploaded file will replace the content of the current object" %}

+

{% trans "Description:" %}

+

{% trans "Object:" %} {% trans "An object is the basic storage entity that represents a file you store in the OpenStack Object Storage system. When you upload data to OpenStack Object Storage, the data is stored as-is (no compression or encryption) and consists of a location (container), the object's name, and any metadata consisting of key/value pairs." %}

+

{% trans "File:" %} {% trans "A new uploaded file will replace the content of the current object" %}

{% endblock %} diff --git a/openstack_dashboard/dashboards/project/containers/templates/containers/_upload.html b/openstack_dashboard/dashboards/project/containers/templates/containers/_upload.html old mode 100644 new mode 100755 index 272c20ece5..e7d2f6b02b --- a/openstack_dashboard/dashboards/project/containers/templates/containers/_upload.html +++ b/openstack_dashboard/dashboards/project/containers/templates/containers/_upload.html @@ -7,7 +7,9 @@ {% block form_action %}{% url 'horizon:project:containers:object_upload' container_name %}{% endblock %} {% block form_attrs %}enctype="multipart/form-data"{% endblock %} -{% block modal-header %}{% trans "Upload Object To Container" %}: {{ container_name }}{% endblock %} +{% block modal-header %} + {% blocktrans %}Upload Object To Container: {{ container_name }}{% endblocktrans %} +{% endblock %} {% block modal-body %}
@@ -16,9 +18,9 @@
-

{% trans "Description" %}:

-

{% trans "Object" %}: {% trans "An object is the basic storage entity that represents a file you store in the OpenStack Object Storage system. When you upload data to OpenStack Object Storage, the data is stored as-is (no compression or encryption) and consists of a location (container), the object's name, and any metadata consisting of key/value pairs." %}

-

{% trans "Pseudo-folder" %}: {% trans "Within a container you can group your objects into pseudo-folders, which behave similarly to folders in your desktop operating system, with the exception that they are virtual collections defined by a common prefix on the object's name. A slash (/) character is used as the delimiter for pseudo-folders in the Object Store." %}

+

{% trans "Description:" %}

+

{% trans "Object:" %} {% trans "An object is the basic storage entity that represents a file you store in the OpenStack Object Storage system. When you upload data to OpenStack Object Storage, the data is stored as-is (no compression or encryption) and consists of a location (container), the object's name, and any metadata consisting of key/value pairs." %}

+

{% trans "Pseudo-folder:" %} {% trans "Within a container you can group your objects into pseudo-folders, which behave similarly to folders in your desktop operating system, with the exception that they are virtual collections defined by a common prefix on the object's name. A slash (/) character is used as the delimiter for pseudo-folders in the Object Store." %}

{% endblock %} diff --git a/openstack_dashboard/dashboards/project/data_processing/cluster_templates/templates/data_processing.cluster_templates/_details.html b/openstack_dashboard/dashboards/project/data_processing/cluster_templates/templates/data_processing.cluster_templates/_details.html old mode 100644 new mode 100755 index de6f2134b4..a2af96f465 --- a/openstack_dashboard/dashboards/project/data_processing/cluster_templates/templates/data_processing.cluster_templates/_details.html +++ b/openstack_dashboard/dashboards/project/data_processing/cluster_templates/templates/data_processing.cluster_templates/_details.html @@ -39,7 +39,7 @@ {% if service_conf %} {% else %} diff --git a/openstack_dashboard/dashboards/project/data_processing/cluster_templates/templates/data_processing.cluster_templates/_nodegroups_details.html b/openstack_dashboard/dashboards/project/data_processing/cluster_templates/templates/data_processing.cluster_templates/_nodegroups_details.html old mode 100644 new mode 100755 index 139bcb4253..f0b09265d8 --- a/openstack_dashboard/dashboards/project/data_processing/cluster_templates/templates/data_processing.cluster_templates/_nodegroups_details.html +++ b/openstack_dashboard/dashboards/project/data_processing/cluster_templates/templates/data_processing.cluster_templates/_nodegroups_details.html @@ -4,7 +4,7 @@
{% for node_group in template.node_groups %}
-

{% trans "Node Group" %}: {{ node_group.name }}

+

{% blocktrans with node_group_name=node_group.name %}Node Group: {{ node_group_name }}{% endblocktrans %}

{% trans "Nodes Count" %}
{{ node_group.count }}
@@ -51,7 +51,7 @@ {% if service_conf %}
    {% for conf_name, conf_value in service_conf.items %} -
  • {{ conf_name }}: {{ conf_value }}
    • +
  • {% blocktrans %}{{ conf_name }}: {{ conf_value }}{% endblocktrans %}
    • {% endfor %}
{% else %} diff --git a/openstack_dashboard/dashboards/project/data_processing/cluster_templates/templates/data_processing.cluster_templates/cluster_node_groups_template.html b/openstack_dashboard/dashboards/project/data_processing/cluster_templates/templates/data_processing.cluster_templates/cluster_node_groups_template.html old mode 100644 new mode 100755 index 089b58130a..707feb55e4 --- a/openstack_dashboard/dashboards/project/data_processing/cluster_templates/templates/data_processing.cluster_templates/cluster_node_groups_template.html +++ b/openstack_dashboard/dashboards/project/data_processing/cluster_templates/templates/data_processing.cluster_templates/cluster_node_groups_template.html @@ -92,7 +92,7 @@ $("#node-templates").hide(); - +