Merge "Imported Translations from Transifex"

doc/admin-guide-cloud/locale/admin-guide-cloud.pot

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-01-01 06:11+0000\n"
+"POT-Creation-Date: 2015-01-05 06:11+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -287,7 +287,7 @@ msgid "Use LIO iSCSI support"
 msgstr ""
 
 #: ./doc/admin-guide-cloud/ch_blockstorage.xml:140(para)
-msgid "The default <option>iscsi_helper</option> tool is <literal>tgtadm</literal>. To use LIO iSCSI, install the <literal>python-rtslib</literal> package, and set <literal>iscsi_helper=lioadm</literal> in the <filename>cinder.conf</filename> file."
+msgid "The default <placeholder-1/> tool is <literal>tgtadm</literal>. To use LIO iSCSI, install the <literal>python-rtslib</literal> package, and set <literal>iscsi_helper=lioadm</literal> in the <filename>cinder.conf</filename> file."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/ch_blockstorage.xml:145(para)
@@ -438,11 +438,7 @@ msgstr ""
 msgid "The configuration file to use."
 msgstr ""
 
-#: ./doc/admin-guide-cloud/ch_database.xml:83(option) ./doc/admin-guide-cloud/ch_database.xml:138(option)
+#: ./doc/admin-guide-cloud/ch_database.xml:88(para) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:267(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:625(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:887(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1009(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1077(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1199(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1595(td) ./doc/admin-guide-cloud/telemetry/section_telemetry-data-collection.xml:579(term)
-msgid "--config-file=/etc/trove/trove.conf"
-msgstr ""
-
-#: ./doc/admin-guide-cloud/ch_database.xml:88(para) ./doc/admin-guide-cloud/networking/section_networking-use.xml:106(option) ./doc/admin-guide-cloud/networking/section_networking-use.xml:210(option) ./doc/admin-guide-cloud/networking/section_networking-use.xml:286(option) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:267(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:625(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:887(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1009(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1077(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1199(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1595(td) ./doc/admin-guide-cloud/telemetry/section_telemetry-data-collection.xml:579(term)
 msgid "name"
 msgstr ""
 
@@ -450,10 +446,6 @@ msgstr ""
 msgid "Name you want to use for this datastore."
 msgstr ""
 
-#: ./doc/admin-guide-cloud/ch_database.xml:94(option) ./doc/admin-guide-cloud/ch_database.xml:149(option) ./doc/admin-guide-cloud/ch_database.xml:171(para) ./doc/admin-guide-cloud/ch_database.xml:191(option)
-msgid "mysql"
-msgstr ""
-
 #: ./doc/admin-guide-cloud/ch_database.xml:99(para)
 msgid "default version"
 msgstr ""
@@ -462,10 +454,6 @@ msgstr ""
 msgid "You can attach multiple versions/images to a datastore. For example, you might have a MySQL 5.5 version and a MySQL 5.6 version. You can designate one version as the default, which the system uses if a user does not explicitly request a specific version."
 msgstr ""
 
-#: ./doc/admin-guide-cloud/ch_database.xml:105(option) ./doc/admin-guide-cloud/ch_database.xml:213(option)
-msgid "\"\""
-msgstr ""
-
 #: ./doc/admin-guide-cloud/ch_database.xml:106(para)
 msgid "At this point, you do not yet have a default version, so pass in an empty string."
 msgstr ""
@@ -498,10 +486,6 @@ msgstr ""
 msgid "The name of the version you are adding to the datastore."
 msgstr ""
 
-#: ./doc/admin-guide-cloud/ch_database.xml:160(option)
-msgid "mysql-5.5"
-msgstr ""
-
 #: ./doc/admin-guide-cloud/ch_database.xml:165(para)
 msgid "datastore manager"
 msgstr ""
@@ -510,6 +494,10 @@ msgstr ""
 msgid "Which datastore manager to use for this version. Typically, the datastore manager is identified by one of the following strings, depending on the database:"
 msgstr ""
 
+#: ./doc/admin-guide-cloud/ch_database.xml:171(para)
+msgid "mysql"
+msgstr ""
+
 #: ./doc/admin-guide-cloud/ch_database.xml:174(para)
 msgid "redis"
 msgstr ""
@@ -538,10 +526,6 @@ msgstr ""
 msgid "The ID of the guest image you just added to the Identity Service. You can get this ID by using the glance <placeholder-1/><replaceable>IMAGE_NAME</replaceable> command."
 msgstr ""
 
-#: ./doc/admin-guide-cloud/ch_database.xml:202(option)
-msgid "bb75f870-0c33-4907-8467-1367f8cb15b6"
-msgstr ""
-
 #: ./doc/admin-guide-cloud/ch_database.xml:207(para)
 msgid "packages"
 msgstr ""
@@ -570,10 +554,6 @@ msgstr ""
 msgid "<literal>0</literal> = disabled"
 msgstr ""
 
-#: ./doc/admin-guide-cloud/ch_database.xml:233(option)
-msgid "1"
-msgstr ""
-
 #: ./doc/admin-guide-cloud/ch_database.xml:240(replaceable)
 msgid "GLANCE_ID"
 msgstr ""
@@ -718,18 +698,10 @@ msgstr ""
 msgid "Valid values are:"
 msgstr ""
 
-#: ./doc/admin-guide-cloud/ch_database.xml:361(option)
-msgid "num_config_servers_per_cluster"
-msgstr ""
-
 #: ./doc/admin-guide-cloud/ch_database.xml:364(para) ./doc/admin-guide-cloud/ch_database.xml:372(para)
 msgid "1 or 3"
 msgstr ""
 
-#: ./doc/admin-guide-cloud/ch_database.xml:369(option)
-msgid "num_query_routers_per_cluster"
-msgstr ""
-
 #: ./doc/admin-guide-cloud/ch_networking.xml:7(title)
 msgid "Networking"
 msgstr ""
@@ -979,11 +951,11 @@ msgid "Authentication middleware with user name and password"
 msgstr ""
 
 #: ./doc/admin-guide-cloud/ch_identity_mgmt.xml:181(para)
-msgid "You can also configure Identity authentication middleware using the <option>admin_user</option> and <option>admin_password</option> options."
+msgid "You can also configure Identity authentication middleware using the <placeholder-1/> and <placeholder-2/> options."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/ch_identity_mgmt.xml:184(para)
-msgid "The <option>admin_token</option> parameter is deprecated, and no longer used for configuring auth_token middleware."
+msgid "The <placeholder-1/> parameter is deprecated, and no longer used for configuring auth_token middleware."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/ch_identity_mgmt.xml:186(para)
@@ -999,7 +971,7 @@ msgid "The middleware parameters in the paste config take priority. You must rem
 msgstr ""
 
 #: ./doc/admin-guide-cloud/ch_identity_mgmt.xml:218(para)
-msgid "This sample paste config filter makes use of the <option>admin_user</option> and <option>admin_password</option> options:"
+msgid "This sample paste config filter makes use of the <placeholder-1/> and <placeholder-2/> options:"
 msgstr ""
 
 #: ./doc/admin-guide-cloud/ch_identity_mgmt.xml:229(para)
@@ -1785,7 +1757,7 @@ msgid "You can create a firewall policy without any rules and add rules later, a
 msgstr ""
 
 #: ./doc/admin-guide-cloud/networking/section_networking_introduction.xml:331(para)
-msgid "FWaaS always adds a default <option>deny all</option> rule at the lowest precedence of each policy. Consequently, a firewall policy with no rules blocks all traffic by default."
+msgid "FWaaS always adds a default <placeholder-1/> rule at the lowest precedence of each policy. Consequently, a firewall policy with no rules blocks all traffic by default."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/networking/section_networking_introduction.xml:339(para)
@@ -1805,7 +1777,7 @@ msgid "Allowed-address-pairs"
 msgstr ""
 
 #: ./doc/admin-guide-cloud/networking/section_networking_introduction.xml:351(para)
-msgid "<option>Allowed-address-pairs</option> enable you to specify mac_address/ip_address(cidr) pairs that pass through a port regardless of subnet. This enables the use of protocols such as VRRP, which floats an IP address between two instances to enable fast data plane failover."
+msgid "<placeholder-1/> enable you to specify mac_address/ip_address(cidr) pairs that pass through a port regardless of subnet. This enables the use of protocols such as VRRP, which floats an IP address between two instances to enable fast data plane failover."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/networking/section_networking_introduction.xml:359(para)
@@ -2143,7 +2115,7 @@ msgid "List all agents:"
 msgstr ""
 
 #: ./doc/admin-guide-cloud/networking/section_networking-multi-dhcp-agents.xml:198(para)
-msgid "The output shows information for four agents. The <literal>alive</literal> field shows <literal>:-)</literal> if the agent reported its state within the period defined by the <option>agent_down_time</option> option in the <filename>neutron.conf</filename> file. Otherwise the <option>alive</option> is <literal>xxx</literal>."
+msgid "The output shows information for four agents. The <literal>alive</literal> field shows <literal>:-)</literal> if the agent reported its state within the period defined by the <placeholder-1/> option in the <filename>neutron.conf</filename> file. Otherwise the <placeholder-2/> is <literal>xxx</literal>."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/networking/section_networking-multi-dhcp-agents.xml:210(para)
@@ -2370,10 +2342,6 @@ msgstr ""
 msgid "Default value"
 msgstr ""
 
-#: ./doc/admin-guide-cloud/networking/section_networking-use.xml:93(option) ./doc/admin-guide-cloud/networking/section_networking-use.xml:247(option) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:273(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1090(td)
-msgid "admin_state_up"
-msgstr ""
-
 #: ./doc/admin-guide-cloud/networking/section_networking-use.xml:94(td) ./doc/admin-guide-cloud/networking/section_networking-use.xml:113(td) ./doc/admin-guide-cloud/networking/section_networking-use.xml:180(td) ./doc/admin-guide-cloud/networking/section_networking-use.xml:248(td)
 msgid "bool"
 msgstr ""
@@ -2386,10 +2354,6 @@ msgstr ""
 msgid "Administrative state of the network. If specified as False (down), this network does not forward packets."
 msgstr ""
 
-#: ./doc/admin-guide-cloud/networking/section_networking-use.xml:100(option) ./doc/admin-guide-cloud/networking/section_networking-use.xml:198(option) ./doc/admin-guide-cloud/networking/section_networking-use.xml:274(option) ./doc/admin-guide-cloud/networking/section_networking-use.xml:345(option) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:261(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:319(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:619(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:662(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:874(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:996(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1064(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1185(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1589(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1630(td)
-msgid "id"
-msgstr ""
-
 #: ./doc/admin-guide-cloud/networking/section_networking-use.xml:101(td) ./doc/admin-guide-cloud/networking/section_networking-use.xml:133(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:262(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:289(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:320(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:333(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:342(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:349(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:364(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:620(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:639(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:663(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:717(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:875(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:881(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:997(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1003(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1065(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1071(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1186(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1230(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1590(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1608(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1631(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1644(td)
 msgid "uuid-str"
 msgstr ""
@@ -2414,10 +2378,6 @@ msgstr ""
 msgid "Human-readable name for this network; is not required to be unique."
 msgstr ""
 
-#: ./doc/admin-guide-cloud/networking/section_networking-use.xml:112(option) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:910(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1022(td)
-msgid "shared"
-msgstr ""
-
 #: ./doc/admin-guide-cloud/networking/section_networking-use.xml:114(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:912(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:974(literal) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1024(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1039(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1447(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1653(td)
 msgid "False"
 msgstr ""
@@ -2426,10 +2386,6 @@ msgstr ""
 msgid "Specifies whether this network resource can be accessed by any tenant. The default policy setting restricts usage of this attribute to administrative users only."
 msgstr ""
 
-#: ./doc/admin-guide-cloud/networking/section_networking-use.xml:120(option) ./doc/admin-guide-cloud/networking/section_networking-use.xml:298(option) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:280(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1097(td)
-msgid "status"
-msgstr ""
-
 #: ./doc/admin-guide-cloud/networking/section_networking-use.xml:122(td) ./doc/admin-guide-cloud/networking/section_networking-use.xml:134(td) ./doc/admin-guide-cloud/networking/section_networking-use.xml:169(td) ./doc/admin-guide-cloud/networking/section_networking-use.xml:218(td) ./doc/admin-guide-cloud/networking/section_networking-use.xml:224(td) ./doc/admin-guide-cloud/networking/section_networking-use.xml:294(td) ./doc/admin-guide-cloud/networking/section_networking-use.xml:300(td) ./doc/admin-guide-cloud/networking/section_networking-use.xml:306(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:138(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:163(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:282(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:290(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:334(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:343(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:365(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:640(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:676(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:718(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:882(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1004(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1072(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1099(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1213(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1231(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1609(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1645(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1661(td)
 msgid "N/A"
 msgstr ""
@@ -2438,10 +2394,6 @@ msgstr ""
 msgid "Indicates whether this network is currently operational."
 msgstr ""
 
-#: ./doc/admin-guide-cloud/networking/section_networking-use.xml:126(option)
-msgid "subnets"
-msgstr ""
-
 #: ./doc/admin-guide-cloud/networking/section_networking-use.xml:127(td)
 msgid "list(uuid-str)"
 msgstr ""
@@ -2454,10 +2406,6 @@ msgstr ""
 msgid "List of subnets associated with this network."
 msgstr ""
 
-#: ./doc/admin-guide-cloud/networking/section_networking-use.xml:132(option) ./doc/admin-guide-cloud/networking/section_networking-use.xml:222(option) ./doc/admin-guide-cloud/networking/section_networking-use.xml:304(option) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:288(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:363(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:638(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:716(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:880(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1002(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1070(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1229(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1607(td)
-msgid "tenant_id"
-msgstr ""
-
 #: ./doc/admin-guide-cloud/networking/section_networking-use.xml:135(td)
 msgid "Tenant owner of the network. Only administrative users can set the tenant identifier; this cannot be changed using authorization policies."
 msgstr ""
@@ -2466,22 +2414,10 @@ msgstr ""
 msgid "Subnet attributes"
 msgstr ""
 
-#: ./doc/admin-guide-cloud/networking/section_networking-use.xml:157(option)
-msgid "allocation_pools"
-msgstr ""
-
 #: ./doc/admin-guide-cloud/networking/section_networking-use.xml:158(td) ./doc/admin-guide-cloud/networking/section_networking-use.xml:192(td) ./doc/admin-guide-cloud/networking/section_networking-use.xml:268(td)
 msgid "list(dict)"
 msgstr ""
 
-#: ./doc/admin-guide-cloud/networking/section_networking-use.xml:159(option) ./doc/admin-guide-cloud/networking/section_networking-use.xml:167(option) ./doc/admin-guide-cloud/networking/section_networking-use.xml:187(option)
-msgid "cidr"
-msgstr ""
-
-#: ./doc/admin-guide-cloud/networking/section_networking-use.xml:160(option) ./doc/admin-guide-cloud/networking/section_networking-use.xml:185(option)
-msgid "gateway_ip"
-msgstr ""
-
 #: ./doc/admin-guide-cloud/networking/section_networking-use.xml:159(td)
 msgid "Every address in <placeholder-1/>, excluding <placeholder-2/> (if configured)."
 msgstr ""
@@ -2494,10 +2430,6 @@ msgstr ""
 msgid "IP range for this subnet, based on the IP version."
 msgstr ""
 
-#: ./doc/admin-guide-cloud/networking/section_networking-use.xml:173(option)
-msgid "dns_nameservers"
-msgstr ""
-
 #: ./doc/admin-guide-cloud/networking/section_networking-use.xml:174(td)
 msgid "list(string)"
 msgstr ""
@@ -2506,10 +2438,6 @@ msgstr ""
 msgid "List of DNS name servers used by hosts in this subnet."
 msgstr ""
 
-#: ./doc/admin-guide-cloud/networking/section_networking-use.xml:179(option)
-msgid "enable_dhcp"
-msgstr ""
-
 #: ./doc/admin-guide-cloud/networking/section_networking-use.xml:182(td)
 msgid "Specifies whether DHCP is enabled for this subnet."
 msgstr ""
@@ -2522,10 +2450,6 @@ msgstr ""
 msgid "Default gateway used by devices in this subnet."
 msgstr ""
 
-#: ./doc/admin-guide-cloud/networking/section_networking-use.xml:191(option)
-msgid "host_routes"
-msgstr ""
-
 #: ./doc/admin-guide-cloud/networking/section_networking-use.xml:194(td)
 msgid "Routes that should be used by devices with IPs from this subnet (not including local subnet route)."
 msgstr ""
@@ -2538,10 +2462,6 @@ msgstr ""
 msgid "UUID representing this subnet."
 msgstr ""
 
-#: ./doc/admin-guide-cloud/networking/section_networking-use.xml:204(option) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:924(td)
-msgid "ip_version"
-msgstr ""
-
 #: ./doc/admin-guide-cloud/networking/section_networking-use.xml:205(td)
 msgid "int"
 msgstr ""
@@ -2558,10 +2478,6 @@ msgstr ""
 msgid "Human-readable name for this subnet (might not be unique)."
 msgstr ""
 
-#: ./doc/admin-guide-cloud/networking/section_networking-use.xml:216(option) ./doc/admin-guide-cloud/networking/section_networking-use.xml:292(option)
-msgid "network_id"
-msgstr ""
-
 #: ./doc/admin-guide-cloud/networking/section_networking-use.xml:219(td)
 msgid "Network with which this subnet is associated."
 msgstr ""
@@ -2582,26 +2498,14 @@ msgstr ""
 msgid "Administrative state of this port. If specified as False (down), this port does not forward packets."
 msgstr ""
 
-#: ./doc/admin-guide-cloud/networking/section_networking-use.xml:254(option)
-msgid "device_id"
-msgstr ""
-
 #: ./doc/admin-guide-cloud/networking/section_networking-use.xml:257(td)
 msgid "Identifies the device using this port (for example, a virtual server's ID)."
 msgstr ""
 
-#: ./doc/admin-guide-cloud/networking/section_networking-use.xml:261(option) ./doc/admin-guide-cloud/networking/section_networking-use.xml:346(option)
-msgid "device_owner"
-msgstr ""
-
 #: ./doc/admin-guide-cloud/networking/section_networking-use.xml:264(td)
 msgid "Identifies the entity using this port (for example, a dhcp agent)."
 msgstr ""
 
-#: ./doc/admin-guide-cloud/networking/section_networking-use.xml:267(option) ./doc/admin-guide-cloud/networking/section_networking-use.xml:346(option)
-msgid "fixed_ips"
-msgstr ""
-
 #: ./doc/admin-guide-cloud/networking/section_networking-use.xml:269(td)
 msgid "Automatically allocated from pool"
 msgstr ""
@@ -2614,10 +2518,6 @@ msgstr ""
 msgid "UUID for this port."
 msgstr ""
 
-#: ./doc/admin-guide-cloud/networking/section_networking-use.xml:280(option) ./doc/admin-guide-cloud/networking/section_networking-use.xml:464(option)
-msgid "mac_address"
-msgstr ""
-
 #: ./doc/admin-guide-cloud/networking/section_networking-use.xml:283(td)
 msgid "Mac address to use on this port."
 msgstr ""
@@ -2683,7 +2583,7 @@ msgid "PORT_ID"
 msgstr ""
 
 #: ./doc/admin-guide-cloud/networking/section_networking-use.xml:357(para)
-msgid "The <option>device_owner</option> field describes who owns the port. A port whose <option>device_owner</option> begins with:"
+msgid "The <placeholder-1/> field describes who owns the port. A port whose <placeholder-2/> begins with:"
 msgstr ""
 
 #: ./doc/admin-guide-cloud/networking/section_networking-use.xml:361(para)
@@ -2699,7 +2599,7 @@ msgid "Administrative operations"
 msgstr ""
 
 #: ./doc/admin-guide-cloud/networking/section_networking-use.xml:371(para)
-msgid "The cloud administrator can run any <placeholder-1/> command on behalf of tenants by specifying an Identity <option>tenant_id</option> in the command, as follows:"
+msgid "The cloud administrator can run any <placeholder-1/> command on behalf of tenants by specifying an Identity <placeholder-2/> in the command, as follows:"
 msgstr ""
 
 #: ./doc/admin-guide-cloud/networking/section_networking-use.xml:374(replaceable) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:193(replaceable) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:200(replaceable) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:210(replaceable) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:220(replaceable)
@@ -2795,7 +2695,7 @@ msgid "VM_NAME"
 msgstr ""
 
 #: ./doc/admin-guide-cloud/networking/section_networking-use.xml:458(para)
-msgid "Searches for ports with a <option>device_id</option> that matches the Compute instance UUID. See <xref linkend=\"network_compute_note\"/>."
+msgid "Searches for ports with a <placeholder-1/> that matches the Compute instance UUID. See <xref linkend=\"network_compute_note\"/>."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/networking/section_networking-use.xml:461(replaceable) ./doc/admin-guide-cloud/networking/section_networking-use.xml:466(replaceable)
@@ -2811,7 +2711,7 @@ msgid "Temporarily disables a port from sending traffic."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/networking/section_networking-use.xml:475(para)
-msgid "The <option>device_id</option> can also be a logical router ID."
+msgid "The <placeholder-1/> can also be a logical router ID."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/networking/section_networking-use.xml:478(title)
@@ -2846,14 +2746,6 @@ msgstr ""
 msgid "NET2-ID"
 msgstr ""
 
-#: ./doc/admin-guide-cloud/networking/section_networking-use.xml:516(option)
-msgid "port-id"
-msgstr ""
-
-#: ./doc/admin-guide-cloud/networking/section_networking-use.xml:516(option)
-msgid "net-id"
-msgstr ""
-
 #: ./doc/admin-guide-cloud/networking/section_networking-use.xml:514(td)
 msgid "Boots a VM with a specific IP address. First, create an Networking port with a specific IP address. Then, boot a VM specifying a <placeholder-1/> rather than a <placeholder-2/>."
 msgstr ""
@@ -3424,6 +3316,10 @@ msgstr ""
 msgid "Router"
 msgstr ""
 
+#: ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:261(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:319(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:619(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:662(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:874(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:996(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1064(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1185(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1589(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1630(td)
+msgid "id"
+msgstr ""
+
 #: ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:263(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:321(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:621(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:664(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:876(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:998(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1066(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1187(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1591(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1632(td)
 msgid "generated"
 msgstr ""
@@ -3436,6 +3332,10 @@ msgstr ""
 msgid "Human-readable name for the router. Might not be unique."
 msgstr ""
 
+#: ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:273(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1090(td)
+msgid "admin_state_up"
+msgstr ""
+
 #: ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:274(td)
 msgid "Bool"
 msgstr ""
@@ -3444,10 +3344,18 @@ msgstr ""
 msgid "The administrative state of router. If false (down), the router does not forward packets."
 msgstr ""
 
+#: ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:280(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1097(td)
+msgid "status"
+msgstr ""
+
 #: ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:284(para)
 msgid "Indicates whether router is currently operational."
 msgstr ""
 
+#: ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:288(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:363(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:638(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:716(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:880(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1002(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1070(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1229(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1607(td)
+msgid "tenant_id"
+msgstr ""
+
 #: ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:291(td)
 msgid "Owner of the router. Only admin users can specify a tenant_id other than its own."
 msgstr ""
@@ -3956,6 +3864,10 @@ msgstr ""
 msgid "This is a read-only attribute that gets populated with the uuid of the firewall policy when this firewall rule is associated with a firewall policy. A firewall rule can be associated with only one firewall policy at a time. However, the association can be changed to a different firewall policy."
 msgstr ""
 
+#: ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:910(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1022(td)
+msgid "shared"
+msgstr ""
+
 #: ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:911(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:972(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1023(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1038(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1091(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1192(td) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1652(td)
 msgid "Boolean"
 msgstr ""
@@ -3968,6 +3880,10 @@ msgstr ""
 msgid "IP protocol (icmp, tcp, udp, None)."
 msgstr ""
 
+#: ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:924(td)
+msgid "ip_version"
+msgstr ""
+
 #: ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:925(td)
 msgid "Integer or String"
 msgstr ""
@@ -4485,7 +4401,7 @@ msgid "When this option is enabled, the operational status will always be retrie
 msgstr ""
 
 #: ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1456(para)
-msgid "When running multiple OpenStack Networking server instances, the status synchronization task should not run on every node; doing so sends unnecessary traffic to the NSX back-end and performs unnecessary DB operations. Set the <option>state_sync_interval</option> configuration option to a non-zero value exclusively on a node designated for back-end status synchronization."
+msgid "When running multiple OpenStack Networking server instances, the status synchronization task should not run on every node; doing so sends unnecessary traffic to the NSX back-end and performs unnecessary DB operations. Set the <placeholder-1/> configuration option to a non-zero value exclusively on a node designated for back-end status synchronization."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:1462(para)
@@ -4813,7 +4729,7 @@ msgid "Replicate the <filename>ovs_neutron_plugin.ini</filename> file that you c
 msgstr ""
 
 #: ./doc/admin-guide-cloud/networking/section_networking_config-agents.xml:67(para)
-msgid "If you use tunneling, update the <filename>ovs_neutron_plugin.ini</filename> file for the node with the IP address that is configured on the data network for the node by using the <option>local_ip</option> value."
+msgid "If you use tunneling, update the <filename>ovs_neutron_plugin.ini</filename> file for the node with the IP address that is configured on the data network for the node by using the <placeholder-1/> value."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/networking/section_networking_config-agents.xml:79(para)
@@ -5041,7 +4957,7 @@ msgid "To use the reference implementation, you must set:"
 msgstr ""
 
 #: ./doc/admin-guide-cloud/networking/section_networking_config-agents.xml:395(para)
-msgid "Set the <option>service_plugins</option> option in the <filename>/etc/neutron/neutron.conf</filename> file on the host that runs <systemitem class=\"service\">neutron-server</systemitem>:"
+msgid "Set the <placeholder-1/> option in the <filename>/etc/neutron/neutron.conf</filename> file on the host that runs <systemitem class=\"service\">neutron-server</systemitem>:"
 msgstr ""
 
 #: ./doc/admin-guide-cloud/networking/section_networking_config-agents.xml:400(para)
@@ -5065,15 +4981,15 @@ msgid "Install the agent:"
 msgstr ""
 
 #: ./doc/admin-guide-cloud/networking/section_networking_config-agents.xml:423(para)
-msgid "Enable the <productname>HAProxy</productname> plug-in by using the <option>service_provider</option> option in the <filename>/etc/neutron/neutron.conf</filename> file:"
+msgid "Enable the <productname>HAProxy</productname> plug-in by using the <placeholder-1/> option in the <filename>/etc/neutron/neutron.conf</filename> file:"
 msgstr ""
 
 #: ./doc/admin-guide-cloud/networking/section_networking_config-agents.xml:431(para)
-msgid "The <option>service_provider</option> option is already defined in the <filename>/usr/share/neutron/neutron-dist.conf</filename> file on Red Hat based systems. Do not define it in <filename>neutron.conf</filename> otherwise the Networking services will fail to restart."
+msgid "The <placeholder-1/> option is already defined in the <filename>/usr/share/neutron/neutron-dist.conf</filename> file on Red Hat based systems. Do not define it in <filename>neutron.conf</filename> otherwise the Networking services will fail to restart."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/networking/section_networking_config-agents.xml:440(para)
-msgid "Enable the load-balancing plug-in by using the <option>service_plugins</option> option in the <filename>/etc/neutron/neutron.conf</filename> file:"
+msgid "Enable the load-balancing plug-in by using the <placeholder-1/> option in the <filename>/etc/neutron/neutron.conf</filename> file:"
 msgstr ""
 
 #: ./doc/admin-guide-cloud/networking/section_networking_config-agents.xml:445(para)
@@ -5113,7 +5029,7 @@ msgid "Enable load balancing in the <guimenu>Project</guimenu> section of the da
 msgstr ""
 
 #: ./doc/admin-guide-cloud/networking/section_networking_config-agents.xml:486(para)
-msgid "Change the <option>enable_lb</option> option to <parameter>True</parameter> in the <filename>local_settings</filename> file (on Fedora, RHEL, and CentOS: <filename>/etc/openstack-dashboard/local_settings</filename>, on Ubuntu and Debian: <filename>/etc/openstack-dashboard/local_settings.py</filename>, and on openSUSE and SLES: <filename>/srv/www/openstack-dashboard/openstack_dashboard/local/local_settings.py</filename>):"
+msgid "Change the <placeholder-1/> option to <parameter>True</parameter> in the <filename>local_settings</filename> file (on Fedora, RHEL, and CentOS: <filename>/etc/openstack-dashboard/local_settings</filename>, on Ubuntu and Debian: <filename>/etc/openstack-dashboard/local_settings.py</filename>, and on openSUSE and SLES: <filename>/srv/www/openstack-dashboard/openstack_dashboard/local/local_settings.py</filename>):"
 msgstr ""
 
 #: ./doc/admin-guide-cloud/networking/section_networking_config-agents.xml:499(para)
@@ -5813,7 +5729,7 @@ msgid "By default, the DHCP agent uses Linux network namespaces to support overl
 msgstr ""
 
 #: ./doc/admin-guide-cloud/networking/section_networking-adv-config.xml:145(para)
-msgid "If the Linux installation does not support network namespaces, you must disable network namespaces in the DHCP agent configuration file. The default value of <option>use_namespaces</option> is <literal>True</literal>."
+msgid "If the Linux installation does not support network namespaces, you must disable network namespaces in the DHCP agent configuration file. The default value of <placeholder-1/> is <literal>True</literal>."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/networking/section_networking-adv-config.xml:152(title)
@@ -5873,19 +5789,19 @@ msgid "For information about network namespaces support, see the <link linkend=\
 msgstr ""
 
 #: ./doc/admin-guide-cloud/networking/section_networking-adv-config.xml:215(para)
-msgid "If the Linux installation does not support network namespaces, you must disable network namespaces in the L3 agent configuration file. The default value of <option>use_namespaces</option> is <literal>True</literal>."
+msgid "If the Linux installation does not support network namespaces, you must disable network namespaces in the L3 agent configuration file. The default value of <placeholder-1/> is <literal>True</literal>."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/networking/section_networking-adv-config.xml:219(para)
-msgid "When you set <option>use_namespaces</option> to <literal>False</literal>, only one router ID is supported per node."
+msgid "When you set <placeholder-1/> to <literal>False</literal>, only one router ID is supported per node."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/networking/section_networking-adv-config.xml:221(para)
-msgid "Use the <option>router_id</option> configuration option to configure the router:"
+msgid "Use the <placeholder-1/> configuration option to configure the router:"
 msgstr ""
 
 #: ./doc/admin-guide-cloud/networking/section_networking-adv-config.xml:226(para)
-msgid "To configure it, you must run the OpenStack Networking service, create a router, and set the router ID value to the <option>router_id</option> value in the L3 agent configuration file."
+msgid "To configure it, you must run the OpenStack Networking service, create a router, and set the router ID value to the <placeholder-1/> value in the L3 agent configuration file."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/networking/section_networking-adv-config.xml:243(title)
@@ -5937,7 +5853,7 @@ msgid "Before starting a L3 agent, you must update the configuration files with
 msgstr ""
 
 #: ./doc/admin-guide-cloud/networking/section_networking-adv-config.xml:276(para)
-msgid "To enable the L3 agent to support multiple external networks, edit the <filename>l3_agent.ini</filename> file and leave the <option>gateway_external_network_id</option> and <option>external_network_bridge</option> parameters unset:"
+msgid "To enable the L3 agent to support multiple external networks, edit the <filename>l3_agent.ini</filename> file and leave the <placeholder-1/> and <placeholder-2/> parameters unset:"
 msgstr ""
 
 #: ./doc/admin-guide-cloud/networking/section_networking-adv-config.xml:287(title)
@@ -5965,7 +5881,7 @@ msgid "The metering agent and the L3 agent must have the same network namespaces
 msgstr ""
 
 #: ./doc/admin-guide-cloud/networking/section_networking-adv-config.xml:325(para)
-msgid "If the Linux installation does not support network namespaces, you must disable network namespaces in the L3 metering configuration file. The default value of the <option>use_namespaces</option> option is <code>True</code>."
+msgid "If the Linux installation does not support network namespaces, you must disable network namespaces in the L3 metering configuration file. The default value of the <placeholder-1/> option is <code>True</code>."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/networking/section_networking-adv-config.xml:332(title)
@@ -6763,7 +6679,7 @@ msgid "Scenario 1: L2 population with Open vSwitch agent"
 msgstr ""
 
 #: ./doc/admin-guide-cloud/networking/section_networking-scenarios.xml:736(para)
-msgid "Enable the l2 population extension in the <emphasis>Open vSwitch</emphasis> agent, and configure the <option>local_ip</option> and <option>tunnel_types</option> parameters in the <filename>ml2_conf.ini</filename> file:"
+msgid "Enable the l2 population extension in the <emphasis>Open vSwitch</emphasis> agent, and configure the <placeholder-1/> and <placeholder-2/> parameters in the <filename>ml2_conf.ini</filename> file:"
 msgstr ""
 
 #: ./doc/admin-guide-cloud/networking/section_networking-scenarios.xml:740(replaceable) ./doc/admin-guide-cloud/networking/section_networking-scenarios.xml:753(replaceable)
@@ -6791,11 +6707,11 @@ msgid "Enable security group API"
 msgstr ""
 
 #: ./doc/admin-guide-cloud/networking/section_networking-scenarios.xml:758(para)
-msgid "The ML2 plug-in can concurrently support different L2 agents (or other mechanisms) with different configuration files, so each L2 agent configuration file (such as <filename>ovs_neutron_plugin.ini</filename> or <filename>linuxbridge_conf.ini</filename>) should contain the appropriate <option>firewall_driver</option> value for that agent in addition to setting <option>enable_security_group</option> to <literal>True</literal> (which is the default)."
+msgid "The ML2 plug-in can concurrently support different L2 agents (or other mechanisms) with different configuration files, so each L2 agent configuration file (such as <filename>ovs_neutron_plugin.ini</filename> or <filename>linuxbridge_conf.ini</filename>) should contain the appropriate <placeholder-1/> value for that agent in addition to setting <placeholder-2/> to <literal>True</literal> (which is the default)."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/networking/section_networking-scenarios.xml:767(para)
-msgid "The <option>firewall_driver</option> value in the API server's <filename>ml2_conf.ini</filename> file does not matter."
+msgid "The <placeholder-1/> value in the API server's <filename>ml2_conf.ini</filename> file does not matter."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/networking/section_networking-scenarios.xml:770(para)
@@ -6927,7 +6843,7 @@ msgid "The alarm evaluation process uses the same mechanism for workload partiti
 msgstr ""
 
 #: ./doc/admin-guide-cloud/telemetry/section_telemetry-alarms.xml:87(para)
-msgid "To use this workload partitioning solution set the <option>evaluation_service</option> option to <literal> default</literal>. For more information, see the alarm section in the <link href=\"http://docs.openstack.org/trunk/config-reference/content/ch_configuring-openstack-telemetry.html\"><citetitle>OpenStack Configuration Reference</citetitle></link>."
+msgid "To use this workload partitioning solution set the <placeholder-1/> option to <literal> default</literal>. For more information, see the alarm section in the <link href=\"http://docs.openstack.org/trunk/config-reference/content/ch_configuring-openstack-telemetry.html\"><citetitle>OpenStack Configuration Reference</citetitle></link>."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/telemetry/section_telemetry-alarms.xml:97(title)
@@ -7347,7 +7263,7 @@ msgid "The log settings can be changed in <filename>ceilometer.conf</filename>.
 msgstr ""
 
 #: ./doc/admin-guide-cloud/telemetry/section_telemetry-troubleshooting-guide.xml:21(para)
-msgid "By default <literal>stderr</literal> is used as standard output for the log messages. It can be changed to either a log file or syslog. The <option>debug</option> and <option>verbose</option> options are also set to false in the default settings, the default log levels of the corresponding modules can be found in the table referred above."
+msgid "By default <literal>stderr</literal> is used as standard output for the log messages. It can be changed to either a log file or syslog. The <placeholder-1/> and <placeholder-2/> options are also set to false in the default settings, the default log levels of the corresponding modules can be found in the table referred above."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/telemetry/section_telemetry-troubleshooting-guide.xml:29(title)
@@ -7383,11 +7299,11 @@ msgid "For the list of meters that are originated from notifications, see the <l
 msgstr ""
 
 #: ./doc/admin-guide-cloud/telemetry/section_telemetry-troubleshooting-guide.xml:69(title)
-msgid "Recommended <option>auth_url</option> to be used"
+msgid "Recommended <placeholder-1/> to be used"
 msgstr ""
 
 #: ./doc/admin-guide-cloud/telemetry/section_telemetry-troubleshooting-guide.xml:70(para)
-msgid "When using the commandline client of Telemetry, the credentials and the <option>os_auth_url</option> has to be set in order to provide the possibility to the client to authenticate against OpenStack Identity. For further details about the credentials that has to be provided see the <link href=\"http://docs.openstack.org/developer/python-ceilometerclient/\"> Python API</link> reference of Telemetry."
+msgid "When using the commandline client of Telemetry, the credentials and the <placeholder-1/> has to be set in order to provide the possibility to the client to authenticate against OpenStack Identity. For further details about the credentials that has to be provided see the <link href=\"http://docs.openstack.org/developer/python-ceilometerclient/\"> Python API</link> reference of Telemetry."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/telemetry/section_telemetry-troubleshooting-guide.xml:77(para)
@@ -7399,11 +7315,11 @@ msgid "OpenStack Identity is about to change API version from v2 to v3. The <lit
 msgstr ""
 
 #: ./doc/admin-guide-cloud/telemetry/section_telemetry-troubleshooting-guide.xml:86(para)
-msgid "The commandline client of Telemetry is not adapted to the v3 version of the OpenStack Identity API. If the <literal>adminURL</literal> is used as <option>os_auth_url</option>, the <placeholder-1/> command results in the following error message: <placeholder-2/>"
+msgid "The commandline client of Telemetry is not adapted to the v3 version of the OpenStack Identity API. If the <literal>adminURL</literal> is used as <placeholder-1/>, the <placeholder-2/> command results in the following error message: <placeholder-3/>"
 msgstr ""
 
 #: ./doc/admin-guide-cloud/telemetry/section_telemetry-troubleshooting-guide.xml:93(para)
-msgid "Therefore when specifying the <option>os_auth_url</option> parameter on the command line or by using environment variable, use the <literal>internalURL</literal> or <literal>publicURL</literal>."
+msgid "Therefore when specifying the <placeholder-1/> parameter on the command line or by using environment variable, use the <literal>internalURL</literal> or <literal>publicURL</literal>."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/telemetry/section_telemetry-troubleshooting-guide.xml:96(para)
@@ -7823,7 +7739,7 @@ msgid "For information about the required configuration options that have to be
 msgstr ""
 
 #: ./doc/admin-guide-cloud/telemetry/section_telemetry-data-collection.xml:295(para)
-msgid "Without the <option>backend_url</option> option being set only one instance of both the central and compute agent service is able to run and function correctly."
+msgid "Without the <placeholder-1/> option being set only one instance of both the central and compute agent service is able to run and function correctly."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/telemetry/section_telemetry-data-collection.xml:299(para)
@@ -7831,19 +7747,19 @@ msgid "The availability check of the instances is provided by heartbeat messages
 msgstr ""
 
 #: ./doc/admin-guide-cloud/telemetry/section_telemetry-data-collection.xml:303(para)
-msgid "<literal>Memcached</literal> uses a <option>timeout</option> value, which should always be set to a value that is higher than the <option>heartbeat</option> value set for Telemetry."
+msgid "<literal>Memcached</literal> uses a <placeholder-1/> value, which should always be set to a value that is higher than the <placeholder-2/> value set for Telemetry."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/telemetry/section_telemetry-data-collection.xml:307(para)
-msgid "For backward compatibility and supporting existing deployments, the central agent configuration also supports using different configuration files for groups of service instances of this type that are running in parallel. For enabling this configuration set a value for the <option>partitioning_group_prefix</option> option in the <link href=\"http://docs.openstack.org/trunk/config-reference/content/ch_configuring-openstack-telemetry.html\"><literal>central</literal> section</link> in the <citetitle>OpenStack Configuration Reference</citetitle>."
+msgid "For backward compatibility and supporting existing deployments, the central agent configuration also supports using different configuration files for groups of service instances of this type that are running in parallel. For enabling this configuration set a value for the <placeholder-1/> option in the <link href=\"http://docs.openstack.org/trunk/config-reference/content/ch_configuring-openstack-telemetry.html\"><literal>central</literal> section</link> in the <citetitle>OpenStack Configuration Reference</citetitle>."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/telemetry/section_telemetry-data-collection.xml:315(para)
-msgid "For each sub-group of the central agent pool with the same <option>partitioning_group_prefix</option> a disjoint subset of meters must be polled, otherwise samples may be missing or duplicated. The list of meters to poll can be set in the <filename>/etc/ceilometer/pipeline.yaml</filename> configuration file. For more information about pipelines see <xref linkend=\"section_telemetry-data-collection-processing\"/>."
+msgid "For each sub-group of the central agent pool with the same <placeholder-1/> a disjoint subset of meters must be polled, otherwise samples may be missing or duplicated. The list of meters to poll can be set in the <filename>/etc/ceilometer/pipeline.yaml</filename> configuration file. For more information about pipelines see <xref linkend=\"section_telemetry-data-collection-processing\"/>."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/telemetry/section_telemetry-data-collection.xml:322(para)
-msgid "To enable the compute agent to run multiple instances simultaneously with workload partitioning, the <option>workload_partitioning</option> option has to be set to <literal>True</literal> under the <link href=\"http://docs.openstack.org/trunk/config-reference/content/ch_configuring-openstack-telemetry.html\"> compute section</link> in the <filename>ceilometer.conf</filename> configuration file."
+msgid "To enable the compute agent to run multiple instances simultaneously with workload partitioning, the <placeholder-1/> option has to be set to <literal>True</literal> under the <link href=\"http://docs.openstack.org/trunk/config-reference/content/ch_configuring-openstack-telemetry.html\"> compute section</link> in the <filename>ceilometer.conf</filename> configuration file."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/telemetry/section_telemetry-data-collection.xml:330(title)
@@ -7855,7 +7771,7 @@ msgid "This agent is responsible for collecting IPMI sensor data and Intel Node
 msgstr ""
 
 #: ./doc/admin-guide-cloud/telemetry/section_telemetry-data-collection.xml:335(para)
-msgid "An IPMI agent instance could be installed on each and every compute node with IPMI support, except that the node is managed by Bare metal module for OpenStack and the <option>conductor.send_sensor_data</option> option is set to <literal>true</literal> in the Bare metal module for OpenStack. It is no harm to install this agent on compute node without IPMI or Intel Node Manager support, as the agent checks for the hardware and if none is available, returns empty data. But it is suggested that you install IPMI agent only on IPMI capable node for performance reason."
+msgid "An IPMI agent instance could be installed on each and every compute node with IPMI support, except that the node is managed by Bare metal module for OpenStack and the <placeholder-1/> option is set to <literal>true</literal> in the Bare metal module for OpenStack. It is no harm to install this agent on compute node without IPMI or Intel Node Manager support, as the agent checks for the hardware and if none is available, returns empty data. But it is suggested that you install IPMI agent only on IPMI capable node for performance reason."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/telemetry/section_telemetry-data-collection.xml:346(para)
@@ -7863,7 +7779,7 @@ msgid "The list of collected meters can be found in the <link href=\"http://docs
 msgstr ""
 
 #: ./doc/admin-guide-cloud/telemetry/section_telemetry-data-collection.xml:350(para)
-msgid "Do not deploy both IPMI agent and Bare metal module for OpenStack on one compute node. If <option>conductor.send_sensor_data</option> set, this misconfiguration causes duplicated IPMI sensor samples."
+msgid "Do not deploy both IPMI agent and Bare metal module for OpenStack on one compute node. If <placeholder-1/> set, this misconfiguration causes duplicated IPMI sensor samples."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/telemetry/section_telemetry-data-collection.xml:358(title)
@@ -8319,7 +8235,7 @@ msgid "HTTP dispatcher"
 msgstr ""
 
 #: ./doc/admin-guide-cloud/telemetry/section_telemetry-data-collection.xml:849(para)
-msgid "The Telemetry module supports sending samples to an external HTTP target. The samples are sent without any modification. To set this option as data storage, the <option>dispatcher</option> has to be changed to <literal>http</literal> in the <filename>ceilometer.conf</filename> configuration file. For the list of options that you need to set, see the see the <link href=\"http://docs.openstack.org/trunk/config-reference/content/ch_configuring-openstack-telemetry.html\"><literal>dispatcher_http</literal> section</link> in the <citetitle>OpenStack Configuration Reference</citetitle>."
+msgid "The Telemetry module supports sending samples to an external HTTP target. The samples are sent without any modification. To set this option as data storage, the <placeholder-1/> has to be changed to <literal>http</literal> in the <filename>ceilometer.conf</filename> configuration file. For the list of options that you need to set, see the see the <link href=\"http://docs.openstack.org/trunk/config-reference/content/ch_configuring-openstack-telemetry.html\"><literal>dispatcher_http</literal> section</link> in the <citetitle>OpenStack Configuration Reference</citetitle>."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/telemetry/section_telemetry-data-collection.xml:859(title)
@@ -8327,7 +8243,7 @@ msgid "File dispatcher"
 msgstr ""
 
 #: ./doc/admin-guide-cloud/telemetry/section_telemetry-data-collection.xml:860(para)
-msgid "You can store samples in a file by setting the <option>dispatcher</option> option in <filename>ceilometer.conf</filename> o <literal>file</literal>. For the list of configuration options, see the <link href=\"http://docs.openstack.org/trunk/config-reference/content/ch_configuring-openstack-telemetry.html\"><literal>dispatcher_file</literal> section</link> in the <citetitle>OpenStack Configuration Reference</citetitle>."
+msgid "You can store samples in a file by setting the <placeholder-1/> option in <filename>ceilometer.conf</filename> o <literal>file</literal>. For the list of configuration options, see the <link href=\"http://docs.openstack.org/trunk/config-reference/content/ch_configuring-openstack-telemetry.html\"><literal>dispatcher_file</literal> section</link> in the <citetitle>OpenStack Configuration Reference</citetitle>."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/telemetry/section_telemetry-data-retrieval.xml:7(title)
@@ -8839,7 +8755,7 @@ msgid "Currently <literal>kerberos</literal> and <literal>x509</literal> are sup
 msgstr ""
 
 #: ./doc/admin-guide-cloud/identity/section_keystone-token-binding.xml:24(para)
-msgid "To enforce checking of token binding, set the <option>enforce_token_bind</option> option to one of these modes:"
+msgid "To enforce checking of token binding, set the <placeholder-1/> option to one of these modes:"
 msgstr ""
 
 #: ./doc/admin-guide-cloud/identity/section_keystone-token-binding.xml:29(literal)
@@ -9139,7 +9055,7 @@ msgid "Enable multiple-storage back ends"
 msgstr ""
 
 #: ./doc/admin-guide-cloud/blockstorage/section_multi_backend.xml:25(para)
-msgid "To enable a multiple-storage back ends, you must set the <option>enabled_backends</option> flag in the <filename>cinder.conf</filename> file. This flag defines the names (separated by a comma) of the configuration groups for the different back ends: one name is associated to one configuration group for a back end (such as, <literal>[lvmdriver-1]</literal>)."
+msgid "To enable a multiple-storage back ends, you must set the <placeholder-1/> flag in the <filename>cinder.conf</filename> file. This flag defines the names (separated by a comma) of the configuration groups for the different back ends: one name is associated to one configuration group for a back end (such as, <literal>[lvmdriver-1]</literal>)."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/blockstorage/section_multi_backend.xml:33(para)
@@ -9163,7 +9079,7 @@ msgid "Configure Block Storage scheduler multi back end"
 msgstr ""
 
 #: ./doc/admin-guide-cloud/blockstorage/section_multi_backend.xml:73(para)
-msgid "You must enable the <option>filter_scheduler</option> option to use multiple-storage back ends. The filter scheduler:"
+msgid "You must enable the <placeholder-1/> option to use multiple-storage back ends. The filter scheduler:"
 msgstr ""
 
 #: ./doc/admin-guide-cloud/blockstorage/section_multi_backend.xml:77(para)
@@ -9171,7 +9087,7 @@ msgid "Filters the available back ends. By default, <literal>AvailabilityZoneFil
 msgstr ""
 
 #: ./doc/admin-guide-cloud/blockstorage/section_multi_backend.xml:85(para)
-msgid "Weights the previously filtered back ends. By default, the <option>CapacityWeigher</option> option is enabled. When this option is enabled, the filter scheduler assigns the highest weight to back ends with the most available capacity."
+msgid "Weights the previously filtered back ends. By default, the <placeholder-1/> option is enabled. When this option is enabled, the filter scheduler assigns the highest weight to back ends with the most available capacity."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/blockstorage/section_multi_backend.xml:93(para)
@@ -9275,7 +9191,7 @@ msgid "<literal>os-vol-mig-status-attr:migstat</literal> - the status of this vo
 msgstr ""
 
 #: ./doc/admin-guide-cloud/blockstorage/section_volume-migration.xml:89(para)
-msgid "<literal>os-vol-mig-status-attr:name_id</literal> - the volume ID that this volume's name on the back-end is based on. Before a volume is ever migrated, its name on the back-end storage may be based on the volume's ID (see the <option>volume_name_template</option> configuration parameter). For example, if <option>volume_name_template</option> is kept as the default value (<literal>volume-%s</literal>), your first LVM back-end has a logical volume named <literal>volume-6088f80a-f116-4331-ad48-9afb0dfb196c</literal>. During the course of a migration, if you create a volume and copy over the data, the volume get the new name but keeps its original ID. This is exposed by the <literal>name_id</literal> attribute."
+msgid "<literal>os-vol-mig-status-attr:name_id</literal> - the volume ID that this volume's name on the back-end is based on. Before a volume is ever migrated, its name on the back-end storage may be based on the volume's ID (see the <placeholder-1/> configuration parameter). For example, if <placeholder-2/> is kept as the default value (<literal>volume-%s</literal>), your first LVM back-end has a logical volume named <literal>volume-6088f80a-f116-4331-ad48-9afb0dfb196c</literal>. During the course of a migration, if you create a volume and copy over the data, the volume get the new name but keeps its original ID. This is exposed by the <literal>name_id</literal> attribute."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/blockstorage/section_volume-migration.xml:107(para)
@@ -9955,7 +9871,7 @@ msgid "Configure and use volume number weighter"
 msgstr ""
 
 #: ./doc/admin-guide-cloud/blockstorage/section_volume_number_weighter.xml:12(para)
-msgid "OpenStack Block Storage enables you to choose a volume back end according to <option>free_capacity</option> and <option>allocated_capacity</option>. The volume number weighter feature lets the scheduler choose a volume back end based on its volume number in the volume back end. This can provide another means to improve the volume back ends' I/O balance and the volumes' I/O performance."
+msgid "OpenStack Block Storage enables you to choose a volume back end according to <placeholder-1/> and <placeholder-2/>. The volume number weighter feature lets the scheduler choose a volume back end based on its volume number in the volume back end. This can provide another means to improve the volume back ends' I/O balance and the volumes' I/O performance."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/blockstorage/section_volume_number_weighter.xml:19(title)
@@ -9963,7 +9879,7 @@ msgid "Enable volume number weighter"
 msgstr ""
 
 #: ./doc/admin-guide-cloud/blockstorage/section_volume_number_weighter.xml:20(para)
-msgid "To enable a volume number weighter, set the <option>scheduler_default_weighters</option> to <literal>VolumeNumberWeigher</literal> flag in the <filename>cinder.conf</filename> file to define <literal>VolumeNumberWeigher</literal> as the selected weighter."
+msgid "To enable a volume number weighter, set the <placeholder-1/> to <literal>VolumeNumberWeigher</literal> flag in the <filename>cinder.conf</filename> file to define <literal>VolumeNumberWeigher</literal> as the selected weighter."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/blockstorage/section_volume_number_weighter.xml:27(para)
@@ -10207,7 +10123,7 @@ msgid "Automate your backups"
 msgstr ""
 
 #: ./doc/admin-guide-cloud/blockstorage/section_backup-block-storage-disks.xml:240(para)
-msgid "Because more and more volumes might be allocated to your Block Storage service, you might want to automate your backups. The <link href=\"https://github.com/Razique/BashStuff/blob/master/SYSTEMS/OpenStack/SCR_5005_V01_NUAC-OPENSTACK-EBS-volumes-backup.sh\">SCR_5005_V01_NUAC-OPENSTACK-EBS-volumes-backup.sh</link> script assists you with this task. The script performs the operations from the previous example, but also provides a mail report and runs the backup based on the <option>backups_retention_days</option> setting."
+msgid "Because more and more volumes might be allocated to your Block Storage service, you might want to automate your backups. The <link href=\"https://github.com/Razique/BashStuff/blob/master/SYSTEMS/OpenStack/SCR_5005_V01_NUAC-OPENSTACK-EBS-volumes-backup.sh\">SCR_5005_V01_NUAC-OPENSTACK-EBS-volumes-backup.sh</link> script assists you with this task. The script performs the operations from the previous example, but also provides a mail report and runs the backup based on the <placeholder-1/> setting."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/blockstorage/section_backup-block-storage-disks.xml:250(para)
@@ -10387,7 +10303,7 @@ msgid "The persistent tgt include file."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/blockstorage/section_ts_cinder_config.xml:143(para)
-msgid "Along with the <option>volumes_dir</option> option, the iSCSI target driver also needs to be configured to look in the correct place for the persist files. This is a simple entry in the <filename>/etc/tgt/conf.d</filename> file that you should have set when you installed OpenStack. If issues occur, verify that you have a <filename>/etc/tgt/conf.d/cinder.conf</filename> file."
+msgid "Along with the <placeholder-1/> option, the iSCSI target driver also needs to be configured to look in the correct place for the persist files. This is a simple entry in the <filename>/etc/tgt/conf.d</filename> file that you should have set when you installed OpenStack. If issues occur, verify that you have a <filename>/etc/tgt/conf.d/cinder.conf</filename> file."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/blockstorage/section_ts_cinder_config.xml:152(para)
@@ -10715,7 +10631,7 @@ msgid "Enable the HTTPS protocol:"
 msgstr ""
 
 #: ./doc/admin-guide-cloud/compute/section_compute-security.xml:20(para)
-msgid "Determine whether insecure SSL connections are accepted for Compute metadata server requests. The default value is <option>False</option>:"
+msgid "Determine whether insecure SSL connections are accepted for Compute metadata server requests. The default value is <placeholder-1/>:"
 msgstr ""
 
 #: ./doc/admin-guide-cloud/compute/section_compute-security.xml:25(para)
@@ -10767,7 +10683,7 @@ msgid "Restart all <literal>nova-*</literal> services."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/compute/section_compute-configure-ipv6.xml:41(para)
-msgid "You can add a fixed range for IPv6 addresses to the <placeholder-1/> command. Specify <option>public</option> or <option>private</option> after the <option>network-create</option> parameter."
+msgid "You can add a fixed range for IPv6 addresses to the <placeholder-1/> command. Specify <placeholder-2/> or <placeholder-3/> after the <placeholder-4/> parameter."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/compute/section_compute-configure-ipv6.xml:44(replaceable)
@@ -11017,11 +10933,11 @@ msgid "The metadata service is implemented by either the <systemitem class=\"ser
 msgstr ""
 
 #: ./doc/admin-guide-cloud/compute/section_compute-networking-nova.xml:334(para)
-msgid "Hosts access the service at <literal>169.254.169.254:80</literal>, and this is translated to <literal>metadata_host:metadata_port</literal> by an iptables rule established by the <systemitem class=\"service\">nova-network</systemitem> service. In multi-host mode, you can set <option>metadata_host</option> to <literal>127.0.0.1</literal>."
+msgid "Hosts access the service at <literal>169.254.169.254:80</literal>, and this is translated to <literal>metadata_host:metadata_port</literal> by an iptables rule established by the <systemitem class=\"service\">nova-network</systemitem> service. In multi-host mode, you can set <placeholder-1/> to <literal>127.0.0.1</literal>."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/compute/section_compute-networking-nova.xml:339(para)
-msgid "To enable instances to reach the metadata service, the <systemitem class=\"service\">nova-network</systemitem> service configures iptables to NAT port <literal>80</literal> of the <literal>169.254.169.254</literal> address to the IP address specified in <option>metadata_host</option> (default <literal>$my_ip</literal>, which is the IP address of the <systemitem class=\"service\">nova-network</systemitem> service) and port specified in <option>metadata_port</option> (default <literal>8775</literal>) in <filename>/etc/nova/nova.conf</filename>."
+msgid "To enable instances to reach the metadata service, the <systemitem class=\"service\">nova-network</systemitem> service configures iptables to NAT port <literal>80</literal> of the <literal>169.254.169.254</literal> address to the IP address specified in <placeholder-1/> (default <literal>$my_ip</literal>, which is the IP address of the <systemitem class=\"service\">nova-network</systemitem> service) and port specified in <placeholder-2/> (default <literal>8775</literal>) in <filename>/etc/nova/nova.conf</filename>."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/compute/section_compute-networking-nova.xml:348(para)
@@ -12007,7 +11923,7 @@ msgid "Instead of calling <placeholder-1/>, Compute services start with a <place
 msgstr ""
 
 #: ./doc/admin-guide-cloud/compute/section_compute-rootwrap.xml:26(para)
-msgid "To use <placeholder-1/>, you must be aware of the issues with using NFS and root-owned files. The NFS share must be configured with the <option>no_root_squash</option> option enabled."
+msgid "To use <placeholder-1/>, you must be aware of the issues with using NFS and root-owned files. The NFS share must be configured with the <placeholder-2/> option enabled."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/compute/section_compute-rootwrap.xml:32(title)
@@ -12187,7 +12103,7 @@ msgid "Because the Compute service does not use the libvirt live migration funct
 msgstr ""
 
 #: ./doc/admin-guide-cloud/compute/section_compute-configure-migrations.xml:74(para)
-msgid "This guide assumes the default value for <option>instances_path</option> in your <filename>nova.conf</filename> file (<filename><replaceable>NOVA-INST-DIR</replaceable>/instances</filename>). If you have changed the <literal>state_path</literal> or <literal>instances_path</literal> variables, modify accordingly."
+msgid "This guide assumes the default value for <placeholder-1/> in your <filename>nova.conf</filename> file (<filename><replaceable>NOVA-INST-DIR</replaceable>/instances</filename>). If you have changed the <literal>state_path</literal> or <literal>instances_path</literal> variables, modify accordingly."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/compute/section_compute-configure-migrations.xml:81(para)
@@ -12811,7 +12727,7 @@ msgid "It is possible to set up the Object Storage node on a separate network, a
 msgstr ""
 
 #: ./doc/admin-guide-cloud/image/section_glance-nova-image-download.xml:35(para)
-msgid "Certain back ends support a more direct method, where on request the Image Service will return a URL that can be used to download the image directly from the back-end store. Currently the only store to support the direct download approach is the filesystem store. It can be configured using the <option>filesystems</option> option in the <literal>image_file_url</literal> section of the <filename>nova.conf</filename> file on compute nodes."
+msgid "Certain back ends support a more direct method, where on request the Image Service will return a URL that can be used to download the image directly from the back-end store. Currently the only store to support the direct download approach is the filesystem store. It can be configured using the <placeholder-1/> option in the <literal>image_file_url</literal> section of the <filename>nova.conf</filename> file on compute nodes."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/image/section_glance-nova-image-download.xml:45(para)

doc/cli-reference/locale/cli-reference.pot

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-12-22 06:12+0000\n"
+"POT-Creation-Date: 2015-01-05 06:11+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,7 +15,7 @@ msgid "Image Service property keys"
 msgstr ""
 
 #: ./doc/cli-reference/ch_cli_glance_property_keys.xml:13(para)
-msgid "The following keys, together with the components to which they are specific, can be used with the <option>property</option> option for both the <placeholder-1/> and <placeholder-2/> commands. For example:"
+msgid "The following keys, together with the components to which they are specific, can be used with the <placeholder-1/> option for both the <placeholder-2/> and <placeholder-3/> commands. For example:"
 msgstr ""
 
 #: ./doc/cli-reference/ch_cli_glance_property_keys.xml:17(replaceable)
@@ -594,14 +594,6 @@ msgstr ""
 msgid "hw_serial_port_count"
 msgstr ""
 
-#: ./doc/cli-reference/ch_cli_glance_property_keys.xml:285(option) ./doc/cli-reference/ch_cli_glance_property_keys.xml:287(option)
-msgid "hw:serial_port_count"
-msgstr ""
-
-#: ./doc/cli-reference/ch_cli_glance_property_keys.xml:286(option) ./doc/cli-reference/ch_cli_glance_property_keys.xml:303(option)
-msgid "extra_specs"
-msgstr ""
-
 #: ./doc/cli-reference/ch_cli_glance_property_keys.xml:285(td)
 msgid "Specifies the count of serial ports that should be provided. If <placeholder-1/> is not set in the flavor's <placeholder-2/>, then any count is permitted. If <placeholder-3/> is set, then this provides the default serial port count. It is permitted to override the default serial port count, but only with a lower value."
 msgstr ""
@@ -642,10 +634,6 @@ msgstr ""
 msgid "hw_video_ram"
 msgstr ""
 
-#: ./doc/cli-reference/ch_cli_glance_property_keys.xml:302(option)
-msgid "hw_video:ram_max_mb"
-msgstr ""
-
 #: ./doc/cli-reference/ch_cli_glance_property_keys.xml:301(td)
 msgid "Maximum RAM for the video image. Used only if a <placeholder-1/> value has been set in the flavor's <placeholder-2/> and that value is higher than the value set in <placeholder-3/>."
 msgstr ""
@@ -946,10 +934,6 @@ msgstr ""
 msgid "For help on a specific <placeholder-1/> command, enter:"
 msgstr ""
 
-#: ./doc/cli-reference/ch_cli_neutron-debug_commands.xml:19(option) ./doc/cli-reference/generated/ch_cli_nova_commands.xml:24(option) ./doc/cli-reference/generated/ch_cli_neutron_commands.xml:24(option) ./doc/cli-reference/generated/ch_cli_heat_commands.xml:24(option) ./doc/cli-reference/generated/ch_cli_ironic_commands.xml:24(option) ./doc/cli-reference/generated/ch_cli_openstack_commands.xml:24(option) ./doc/cli-reference/generated/ch_cli_glance_commands.xml:24(option) ./doc/cli-reference/generated/ch_cli_keystone_commands.xml:24(option) ./doc/cli-reference/generated/ch_cli_ceilometer_commands.xml:24(option) ./doc/cli-reference/generated/ch_cli_sahara_commands.xml:24(option) ./doc/cli-reference/generated/ch_cli_cinder_commands.xml:24(option) ./doc/cli-reference/generated/ch_cli_trove_commands.xml:24(option)
-msgid "help"
-msgstr ""
-
 #: ./doc/cli-reference/ch_cli_neutron-debug_commands.xml:19(replaceable) ./doc/cli-reference/generated/ch_cli_nova_commands.xml:24(replaceable) ./doc/cli-reference/generated/ch_cli_neutron_commands.xml:24(replaceable) ./doc/cli-reference/generated/ch_cli_heat_commands.xml:24(replaceable) ./doc/cli-reference/generated/ch_cli_swift_commands.xml:24(replaceable) ./doc/cli-reference/generated/ch_cli_ironic_commands.xml:24(replaceable) ./doc/cli-reference/generated/ch_cli_openstack_commands.xml:24(replaceable) ./doc/cli-reference/generated/ch_cli_glance_commands.xml:24(replaceable) ./doc/cli-reference/generated/ch_cli_keystone_commands.xml:24(replaceable) ./doc/cli-reference/generated/ch_cli_ceilometer_commands.xml:24(replaceable) ./doc/cli-reference/generated/ch_cli_sahara_commands.xml:24(replaceable) ./doc/cli-reference/generated/ch_cli_cinder_commands.xml:24(replaceable) ./doc/cli-reference/generated/ch_cli_trove_commands.xml:24(replaceable) ./doc/cli-reference/generated/ch_cli_trove-manage_commands.xml:20(replaceable)
 msgid "COMMAND"
 msgstr ""
@@ -7138,10 +7122,6 @@ msgstr ""
 msgid "The <placeholder-1/> client is the command-line interface (CLI) for the OpenStack Object Storage API and its extensions. This chapter documents <placeholder-2/> version <literal>2.3.1</literal>."
 msgstr ""
 
-#: ./doc/cli-reference/generated/ch_cli_swift_commands.xml:24(option) ./doc/cli-reference/generated/ch_cli_trove-manage_commands.xml:20(option)
-msgid "--help"
-msgstr ""
-
 #: ./doc/cli-reference/generated/ch_cli_swift_commands.xml:27(title)
 msgid "swift usage"
 msgstr ""

doc/image-guide/locale/fr.po

@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenStack Manuals\n"
-"POT-Creation-Date: 2014-12-31 05:36+0000\n"
+"POT-Creation-Date: 2015-01-03 16:25+0000\n"
-"PO-Revision-Date: 2014-12-31 05:36+0000\n"
+"PO-Revision-Date: 2015-01-02 19:10+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/openstack-manuals-i18n/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -2286,9 +2286,9 @@ msgid ""
 "href=\"http://archive.gplhost.com/debian/pool/juno-"
 "backports/main/s/sysvinit/bootlogd_2.88dsf-41+deb7u2_amd64.deb\"> fixed "
 "version is available from the non-official GPLHost repository</link>. To "
-"install it on top of the image, it is possible to use the <option>--hook-"
+"install it on top of the image, it is possible to use the <placeholder-2/> "
-"script</option> option of the <placeholder-2/> script, with this kind of "
+"option of the <placeholder-3/> script, with this kind of script as "
-"script as parameter: <placeholder-3/>"
+"parameter: <placeholder-4/>"
 msgstr ""
 
 #: ./doc/image-guide/ch_obtaining_images.xml124(title)
@@ -2612,19 +2612,19 @@ msgstr "Les métadonnées d'Image peuvent aider les utilisateurs finaux à déte
 
 #: ./doc/image-guide/section_glance-image-metadata.xml11(para)
 msgid ""
-"Metadata can also determine the scheduling of hosts. If the "
+"Metadata can also determine the scheduling of hosts. If the <placeholder-1/>"
-"<option>property</option> option is set on an image, and Compute is "
+" option is set on an image, and Compute is configured so that the "
-"configured so that the <systemitem>ImagePropertiesFilter</systemitem> "
+"<systemitem>ImagePropertiesFilter</systemitem> scheduler filter is enabled "
-"scheduler filter is enabled (default), then the scheduler only considers "
+"(default), then the scheduler only considers compute hosts that satisfy that"
-"compute hosts that satisfy that property."
+" property."
-msgstr "Les métadonnées peuvent aussi déterminer l'ordonnancement des hôtes. Si l'option <option>property</option> est réglée sur une image, et que Compute est configuré de manière à ce que le filtre d'ordonnancement <systemitem>ImagePropertiesFilter</systemitem> soit activé (par défaut), alors l'ordonnanceur considère seulement les hôtes de calcul qui satisfont cette propriété."
+msgstr ""
 
 #: ./doc/image-guide/section_glance-image-metadata.xml15(para)
 msgid ""
 "Compute's <systemitem>ImagePropertiesFilter</systemitem> value is specified "
-"in the <option>scheduler_default_filter</option> value in the "
+"in the <placeholder-1/> value in the "
 "<filename>/etc/nova/nova.conf</filename> file."
-msgstr "La valeur de calcul <systemitem>ImagePropertiesFilter</systemitem> est spécifiée dans la valeur <option>scheduler_default_filter</option> du fichier <filename>/etc/nova/nova.conf</filename>."
+msgstr ""
 
 #: ./doc/image-guide/section_glance-image-metadata.xml18(para)
 msgid ""
@@ -2662,10 +2662,9 @@ msgstr ""
 msgid ""
 "When creating Block Storage volumes from images, also consider your "
 "configured image properties. If you alter the core image properties, you "
-"should also update your Block Storage configuration. Amend "
+"should also update your Block Storage configuration. Amend <placeholder-1/> "
-"<option>glance_core_properties</option> in the "
+"in the <filename>/etc/cinder/cinder.conf</filename> file on all controller "
-"<filename>/etc/cinder/cinder.conf</filename> file on all controller nodes to"
+"nodes to match the core properties you have set in the Image service."
-" match the core properties you have set in the Image service."
 msgstr ""
 
 #: ./doc/image-guide/ch_openstack_images.xml11(title)

doc/image-guide/locale/image-guide.pot

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-12-31 06:13+0000\n"
+"POT-Creation-Date: 2015-01-05 06:11+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1558,7 +1558,7 @@ msgid "Debian does not (yet) provide images for direct download. Instead, a pack
 msgstr ""
 
 #: ./doc/image-guide/ch_obtaining_images.xml:103(para)
-msgid "If building the image for Wheezy, packages like <package>cloud-init</package>, <package>cloud-utils</package> or <package>cloud-initramfs-growroot</package> will be pulled from wheezy-backports. Also, the current version of <package>bootlogd</package> in Wheezy doesn't support logging to multiple consoles, which is needed so that both the OpenStack Dashboard console and the <placeholder-1/> console works. However, a <link href=\"http://archive.gplhost.com/debian/pool/juno-backports/main/s/sysvinit/bootlogd_2.88dsf-41+deb7u2_amd64.deb\"> fixed version is available from the non-official GPLHost repository</link>. To install it on top of the image, it is possible to use the <option>--hook-script</option> option of the <placeholder-2/> script, with this kind of script as parameter: <placeholder-3/>"
+msgid "If building the image for Wheezy, packages like <package>cloud-init</package>, <package>cloud-utils</package> or <package>cloud-initramfs-growroot</package> will be pulled from wheezy-backports. Also, the current version of <package>bootlogd</package> in Wheezy doesn't support logging to multiple consoles, which is needed so that both the OpenStack Dashboard console and the <placeholder-1/> console works. However, a <link href=\"http://archive.gplhost.com/debian/pool/juno-backports/main/s/sysvinit/bootlogd_2.88dsf-41+deb7u2_amd64.deb\"> fixed version is available from the non-official GPLHost repository</link>. To install it on top of the image, it is possible to use the <placeholder-2/> option of the <placeholder-3/> script, with this kind of script as parameter: <placeholder-4/>"
 msgstr ""
 
 #: ./doc/image-guide/ch_obtaining_images.xml:124(title)
@@ -1770,11 +1770,11 @@ msgid "Image metadata can help end users determine the nature of an image, and i
 msgstr ""
 
 #: ./doc/image-guide/section_glance-image-metadata.xml:11(para)
-msgid "Metadata can also determine the scheduling of hosts. If the <option>property</option> option is set on an image, and Compute is configured so that the <systemitem>ImagePropertiesFilter</systemitem> scheduler filter is enabled (default), then the scheduler only considers compute hosts that satisfy that property."
+msgid "Metadata can also determine the scheduling of hosts. If the <placeholder-1/> option is set on an image, and Compute is configured so that the <systemitem>ImagePropertiesFilter</systemitem> scheduler filter is enabled (default), then the scheduler only considers compute hosts that satisfy that property."
 msgstr ""
 
 #: ./doc/image-guide/section_glance-image-metadata.xml:15(para)
-msgid "Compute's <systemitem>ImagePropertiesFilter</systemitem> value is specified in the <option>scheduler_default_filter</option> value in the <filename>/etc/nova/nova.conf</filename> file."
+msgid "Compute's <systemitem>ImagePropertiesFilter</systemitem> value is specified in the <placeholder-1/> value in the <filename>/etc/nova/nova.conf</filename> file."
 msgstr ""
 
 #: ./doc/image-guide/section_glance-image-metadata.xml:18(para)
@@ -1798,7 +1798,7 @@ msgid "Volume-from-Image properties"
 msgstr ""
 
 #: ./doc/image-guide/section_glance-image-metadata.xml:72(para)
-msgid "When creating Block Storage volumes from images, also consider your configured image properties. If you alter the core image properties, you should also update your Block Storage configuration. Amend <option>glance_core_properties</option> in the <filename>/etc/cinder/cinder.conf</filename> file on all controller nodes to match the core properties you have set in the Image service."
+msgid "When creating Block Storage volumes from images, also consider your configured image properties. If you alter the core image properties, you should also update your Block Storage configuration. Amend <placeholder-1/> in the <filename>/etc/cinder/cinder.conf</filename> file on all controller nodes to match the core properties you have set in the Image service."
 msgstr ""
 
 #: ./doc/image-guide/ch_openstack_images.xml:11(title)

doc/image-guide/locale/ja.po

@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenStack Manuals\n"
-"POT-Creation-Date: 2014-12-31 05:36+0000\n"
+"POT-Creation-Date: 2015-01-03 16:25+0000\n"
-"PO-Revision-Date: 2014-12-31 05:36+0000\n"
+"PO-Revision-Date: 2015-01-02 19:10+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/openstack-manuals-i18n/language/ja/)\n"
 "MIME-Version: 1.0\n"
@@ -2286,10 +2286,10 @@ msgid ""
 "href=\"http://archive.gplhost.com/debian/pool/juno-"
 "backports/main/s/sysvinit/bootlogd_2.88dsf-41+deb7u2_amd64.deb\"> fixed "
 "version is available from the non-official GPLHost repository</link>. To "
-"install it on top of the image, it is possible to use the <option>--hook-"
+"install it on top of the image, it is possible to use the <placeholder-2/> "
-"script</option> option of the <placeholder-2/> script, with this kind of "
+"option of the <placeholder-3/> script, with this kind of script as "
-"script as parameter: <placeholder-3/>"
+"parameter: <placeholder-4/>"
-msgstr "Wheezy イメージを構築している場合、<package>cloud-init</package>、<package>cloud-utils</package>、<package>cloud-initramfs-growroot</package> のようなパッケージが wheezy バックポートから取得されます。また、Wheezy の <package>bootlogd</package> の最新版は、複数コンソールへのログインをサポートしません。これは OpenStack Dashboard のコンソールと <placeholder-1/> のコンソールを動作させるために必要になります。しかしながら、<link href=\"http://archive.gplhost.com/debian/pool/juno-backports/main/s/sysvinit/bootlogd_2.88dsf-41+deb7u2_amd64.deb\">修正バージョンが非公式 GPLHost リポジトリーから取得できます</link>。イメージの上にインストールするために、パラメーターとしてこの種類のスクリプトを用いて、<placeholder-2/> スクリプトの <option>--hook-script</option> オプションを使用できます。"
+msgstr ""
 
 #: ./doc/image-guide/ch_obtaining_images.xml124(title)
 msgid "Official images from other Linux distributions"
@@ -2612,19 +2612,19 @@ msgstr "イメージメタデータは、エンドユーザーがイメージの
 
 #: ./doc/image-guide/section_glance-image-metadata.xml11(para)
 msgid ""
-"Metadata can also determine the scheduling of hosts. If the "
+"Metadata can also determine the scheduling of hosts. If the <placeholder-1/>"
-"<option>property</option> option is set on an image, and Compute is "
+" option is set on an image, and Compute is configured so that the "
-"configured so that the <systemitem>ImagePropertiesFilter</systemitem> "
+"<systemitem>ImagePropertiesFilter</systemitem> scheduler filter is enabled "
-"scheduler filter is enabled (default), then the scheduler only considers "
+"(default), then the scheduler only considers compute hosts that satisfy that"
-"compute hosts that satisfy that property."
+" property."
-msgstr "メタデータは、ホストのスケジューリングも決められます。<option>property</option> オプションがイメージに設定されていて、<systemitem>ImagePropertiesFilter</systemitem> スケジューラーが有効 (デフォルト) になるよう Compute が設定されている場合、スケジューラーはプロパティーを満たすコンピュートホストのみを考慮します。"
+msgstr ""
 
 #: ./doc/image-guide/section_glance-image-metadata.xml15(para)
 msgid ""
 "Compute's <systemitem>ImagePropertiesFilter</systemitem> value is specified "
-"in the <option>scheduler_default_filter</option> value in the "
+"in the <placeholder-1/> value in the "
 "<filename>/etc/nova/nova.conf</filename> file."
-msgstr "Compute の <systemitem>ImagePropertiesFilter</systemitem> 値は、<filename>/etc/nova/nova.conf</filename> ファイルの <option>scheduler_default_filter</option> 値に指定されます。"
+msgstr ""
 
 #: ./doc/image-guide/section_glance-image-metadata.xml18(para)
 msgid ""
@@ -2662,11 +2662,10 @@ msgstr "Volume-from-Image プロパティ"
 msgid ""
 "When creating Block Storage volumes from images, also consider your "
 "configured image properties. If you alter the core image properties, you "
-"should also update your Block Storage configuration. Amend "
+"should also update your Block Storage configuration. Amend <placeholder-1/> "
-"<option>glance_core_properties</option> in the "
+"in the <filename>/etc/cinder/cinder.conf</filename> file on all controller "
-"<filename>/etc/cinder/cinder.conf</filename> file on all controller nodes to"
+"nodes to match the core properties you have set in the Image service."
-" match the core properties you have set in the Image service."
+msgstr ""
-msgstr "Block Storage のボリュームをイメージから作成した場合、イメージのプロパティを設定することを考慮します。イメージの主要プロパティを変更する場合、Block Storage の設定も更新すべきです。すべてのコントローラーノードで <filename>/etc/cinder/cinder.conf</filename> ファイルの <option>glance_core_properties</option> を修正して、Image Service に設定した主要プロパティを一致させます。"
 
 #: ./doc/image-guide/ch_openstack_images.xml11(title)
 msgid "OpenStack Linux image requirements"

doc/install-guide/locale/install-guide.pot

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-12-31 06:13+0000\n"
+"POT-Creation-Date: 2015-01-05 06:11+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -660,11 +660,11 @@ msgid "SAHARA_DBPASS"
 msgstr ""
 
 #: ./doc/install-guide/section_sahara-install.xml:41(para)
-msgid "First, edit <option>connection</option> parameter in the <literal>[database]</literal> section. The URL provided here should point to an empty database. For instance, connection string for MySQL database will be: <placeholder-1/>"
+msgid "First, edit <placeholder-1/> parameter in the <literal>[database]</literal> section. The URL provided here should point to an empty database. For instance, connection string for MySQL database will be: <placeholder-2/>"
 msgstr ""
 
 #: ./doc/install-guide/section_sahara-install.xml:47(para)
-msgid "Switch to the <literal>[keystone_authtoken]</literal> section. The <option>auth_uri</option> parameter should point to the public Identity API endpoint. <option>identity_uri</option> should point to the admin Identity API endpoint. For example: <placeholder-1/>"
+msgid "Switch to the <literal>[keystone_authtoken]</literal> section. The <placeholder-1/> parameter should point to the public Identity API endpoint. <placeholder-2/> should point to the admin Identity API endpoint. For example: <placeholder-3/>"
 msgstr ""
 
 #: ./doc/install-guide/section_sahara-install.xml:54(para)
@@ -2584,7 +2584,7 @@ msgid "Select the ML2 plug-in:"
 msgstr ""
 
 #: ./doc/install-guide/section_neutron-compute-node.xml:66(para) ./doc/install-guide/section_neutron-controller-node.xml:148(para) ./doc/install-guide/section_neutron-network-node.xml:70(para)
-msgid "Selecting the ML2 plug-in also populates the <option>service_plugins</option> and <option>allow_overlapping_ips</option> options in the <filename>/etc/neutron/neutron.conf</filename> file with the appropriate values."
+msgid "Selecting the ML2 plug-in also populates the <placeholder-1/> and <placeholder-2/> options in the <filename>/etc/neutron/neutron.conf</filename> file with the appropriate values."
 msgstr ""
 
 #: ./doc/install-guide/section_neutron-compute-node.xml:75(title) ./doc/install-guide/section_neutron-network-node.xml:79(title)

doc/install-guide/locale/ja.po

@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenStack Manuals\n"
-"POT-Creation-Date: 2014-12-31 05:36+0000\n"
+"POT-Creation-Date: 2015-01-03 16:25+0000\n"
-"PO-Revision-Date: 2014-12-30 16:00+0000\n"
+"PO-Revision-Date: 2015-01-02 19:10+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/openstack-manuals-i18n/language/ja/)\n"
 "MIME-Version: 1.0\n"
@@ -1278,19 +1278,18 @@ msgstr "SAHARA_DBPASS"
 
 #: ./doc/install-guide/section_sahara-install.xml41(para)
 msgid ""
-"First, edit <option>connection</option> parameter in the "
+"First, edit <placeholder-1/> parameter in the <literal>[database]</literal> "
-"<literal>[database]</literal> section. The URL provided here should point to"
+"section. The URL provided here should point to an empty database. For "
-" an empty database. For instance, connection string for MySQL database will "
+"instance, connection string for MySQL database will be: <placeholder-2/>"
-"be: <placeholder-1/>"
+msgstr ""
-msgstr "最初に、<literal>[database]</literal> セクションの <option>connection</option> パラメーターを編集します。ここに示された URL は、空のデーターベースを指し示すべきです。例えば、MySQL 用の connection 文字列は以下のとおりです。<placeholder-1/>"
 
 #: ./doc/install-guide/section_sahara-install.xml47(para)
 msgid ""
 "Switch to the <literal>[keystone_authtoken]</literal> section. The "
-"<option>auth_uri</option> parameter should point to the public Identity API "
+"<placeholder-1/> parameter should point to the public Identity API endpoint."
-"endpoint. <option>identity_uri</option> should point to the admin Identity "
+" <placeholder-2/> should point to the admin Identity API endpoint. For "
-"API endpoint. For example: <placeholder-1/>"
+"example: <placeholder-3/>"
-msgstr "<literal>[keystone_authtoken]</literal> セクションに切り替えます。<option>auth_uri</option> パラメーターは、Identity API パブリックエンドポイントを指し示すべきです。<option>identity_uri</option> は Identity API 管理エンドポイントを指し示すべきです。例: <placeholder-1/>"
+msgstr ""
 
 #: ./doc/install-guide/section_sahara-install.xml54(para)
 msgid ""
@@ -4405,10 +4404,10 @@ msgstr "ML2 プラグインを選択します。"
 #: ./doc/install-guide/section_neutron-controller-node.xml148(para)
 #: ./doc/install-guide/section_neutron-network-node.xml70(para)
 msgid ""
-"Selecting the ML2 plug-in also populates the "
+"Selecting the ML2 plug-in also populates the <placeholder-1/> and "
-"<option>service_plugins</option> and <option>allow_overlapping_ips</option> "
+"<placeholder-2/> options in the "
-"options in the <filename>/etc/neutron/neutron.conf</filename> file with the "
+"<filename>/etc/neutron/neutron.conf</filename> file with the appropriate "
-"appropriate values."
+"values."
 msgstr ""
 
 #: ./doc/install-guide/section_neutron-compute-node.xml75(title)

doc/install-guide/locale/pt_BR.po

@@ -12,9 +12,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenStack Manuals\n"
-"POT-Creation-Date: 2014-12-31 05:36+0000\n"
+"POT-Creation-Date: 2015-01-03 16:25+0000\n"
-"PO-Revision-Date: 2014-12-31 05:37+0000\n"
+"PO-Revision-Date: 2015-01-02 19:10+0000\n"
-"Last-Translator: Tom Fifield <tom@openstack.org>\n"
+"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/openstack-manuals-i18n/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1285,19 +1285,18 @@ msgstr "SAHARA_DBPASS"
 
 #: ./doc/install-guide/section_sahara-install.xml41(para)
 msgid ""
-"First, edit <option>connection</option> parameter in the "
+"First, edit <placeholder-1/> parameter in the <literal>[database]</literal> "
-"<literal>[database]</literal> section. The URL provided here should point to"
+"section. The URL provided here should point to an empty database. For "
-" an empty database. For instance, connection string for MySQL database will "
+"instance, connection string for MySQL database will be: <placeholder-2/>"
-"be: <placeholder-1/>"
+msgstr ""
-msgstr "Primeiro, edite o parâmetro <option>connection</option> na seção <literal>[database]</literal>. A URL fornecida aqui deve apontar para uma base de dados vazia. Por exemplo, a string de conexão para a base de dados MySQL será: <placeholder-1/> "
 
 #: ./doc/install-guide/section_sahara-install.xml47(para)
 msgid ""
 "Switch to the <literal>[keystone_authtoken]</literal> section. The "
-"<option>auth_uri</option> parameter should point to the public Identity API "
+"<placeholder-1/> parameter should point to the public Identity API endpoint."
-"endpoint. <option>identity_uri</option> should point to the admin Identity "
+" <placeholder-2/> should point to the admin Identity API endpoint. For "
-"API endpoint. For example: <placeholder-1/>"
+"example: <placeholder-3/>"
-msgstr "Alterne para a seção <literal>[keystone_authtoken]</literal>. O parâmetro <option>auth_uri</option> deve apontar para o endpoint público da API de Identidade. <option>identity_uri</option> deve apontar para o endpoint da API de Identidade de admin. Por exemplo: <placeholder-1/>"
+msgstr ""
 
 #: ./doc/install-guide/section_sahara-install.xml54(para)
 msgid ""
@@ -4412,11 +4411,11 @@ msgstr "Selecione o plug-in ML2:"
 #: ./doc/install-guide/section_neutron-controller-node.xml148(para)
 #: ./doc/install-guide/section_neutron-network-node.xml70(para)
 msgid ""
-"Selecting the ML2 plug-in also populates the "
+"Selecting the ML2 plug-in also populates the <placeholder-1/> and "
-"<option>service_plugins</option> and <option>allow_overlapping_ips</option> "
+"<placeholder-2/> options in the "
-"options in the <filename>/etc/neutron/neutron.conf</filename> file with the "
+"<filename>/etc/neutron/neutron.conf</filename> file with the appropriate "
-"appropriate values."
+"values."
-msgstr "Selecionando o plug-in ML2 também popula as opções <option>service_plugins</option> e <option>allow_overlapping_ips</option> no arquivo <filename>/etc/neutron/neutron.conf</filename> com valores apropriados."
+msgstr ""
 
 #: ./doc/install-guide/section_neutron-compute-node.xml75(title)
 #: ./doc/install-guide/section_neutron-network-node.xml79(title)

doc/networking-guide/locale/networking-guide.pot

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-12-24 06:12+0000\n"
+"POT-Creation-Date: 2015-01-05 06:11+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1917,7 +1917,7 @@ msgid "When this option is enabled, the operational status will always be retrie
 msgstr ""
 
 #: ./doc/networking-guide/section_networking_adv_features.xml:1458(para)
-msgid "When running multiple OpenStack Networking server instances, the status synchronization task should not run on every node; doing so sends unnecessary traffic to the NSX back-end and performs unnecessary DB operations. Set the <option>state_sync_interval</option> configuration option to a non-zero value exclusively on a node designated for back-end status synchronization."
+msgid "When running multiple OpenStack Networking server instances, the status synchronization task should not run on every node; doing so sends unnecessary traffic to the NSX back-end and performs unnecessary DB operations. Set the <placeholder-1/> configuration option to a non-zero value exclusively on a node designated for back-end status synchronization."
 msgstr ""
 
 #: ./doc/networking-guide/section_networking_adv_features.xml:1464(para)
@@ -2584,7 +2584,7 @@ msgid "By default, the DHCP agent uses Linux network namespaces to support overl
 msgstr ""
 
 #: ./doc/networking-guide/section_networking_adv_agent.xml:142(para)
-msgid "If the Linux installation does not support network namespaces, you must disable network namespaces in the DHCP agent configuration file. The default value of <option>use_namespaces</option> is <literal>True</literal>."
+msgid "If the Linux installation does not support network namespaces, you must disable network namespaces in the DHCP agent configuration file. The default value of <placeholder-1/> is <literal>True</literal>."
 msgstr ""
 
 #: ./doc/networking-guide/section_networking_adv_agent.xml:149(title)
@@ -2644,19 +2644,19 @@ msgid "For information about network namespaces support, see the <link linkend=\
 msgstr ""
 
 #: ./doc/networking-guide/section_networking_adv_agent.xml:212(para)
-msgid "If the Linux installation does not support network namespaces, you must disable network namespaces in the L3 agent configuration file. The default value of <option>use_namespaces</option> is <literal>True</literal>."
+msgid "If the Linux installation does not support network namespaces, you must disable network namespaces in the L3 agent configuration file. The default value of <placeholder-1/> is <literal>True</literal>."
 msgstr ""
 
 #: ./doc/networking-guide/section_networking_adv_agent.xml:216(para)
-msgid "When you set <option>use_namespaces</option> to <literal>False</literal>, only one router ID is supported per node."
+msgid "When you set <placeholder-1/> to <literal>False</literal>, only one router ID is supported per node."
 msgstr ""
 
 #: ./doc/networking-guide/section_networking_adv_agent.xml:218(para)
-msgid "Use the <option>router_id</option> configuration option to configure the router:"
+msgid "Use the <placeholder-1/> configuration option to configure the router:"
 msgstr ""
 
 #: ./doc/networking-guide/section_networking_adv_agent.xml:223(para)
-msgid "To configure it, you must run the OpenStack Networking service, create a router, and set the router ID value to the <option>router_id</option> value in the L3 agent configuration file."
+msgid "To configure it, you must run the OpenStack Networking service, create a router, and set the router ID value to the <placeholder-1/> value in the L3 agent configuration file."
 msgstr ""
 
 #: ./doc/networking-guide/section_networking_adv_agent.xml:240(title)
@@ -2708,7 +2708,7 @@ msgid "Before starting a L3 agent, you must update the configuration files with
 msgstr ""
 
 #: ./doc/networking-guide/section_networking_adv_agent.xml:273(para)
-msgid "To enable the L3 agent to support multiple external networks, edit the <filename>l3_agent.ini</filename> file and leave the <option>gateway_external_network_id</option> and <option>external_network_bridge</option> parameters unset:"
+msgid "To enable the L3 agent to support multiple external networks, edit the <filename>l3_agent.ini</filename> file and leave the <placeholder-1/> and <placeholder-2/> parameters unset:"
 msgstr ""
 
 #: ./doc/networking-guide/section_networking_adv_agent.xml:285(title)
@@ -2736,7 +2736,7 @@ msgid "The metering agent and the L3 agent must have the same network namespaces
 msgstr ""
 
 #: ./doc/networking-guide/section_networking_adv_agent.xml:323(para)
-msgid "If the Linux installation does not support network namespaces, you must disable network namespaces in the L3 metering configuration file. The default value of the <option>use_namespaces</option> option is <code>True</code>."
+msgid "If the Linux installation does not support network namespaces, you must disable network namespaces in the L3 metering configuration file. The default value of the <placeholder-1/> option is <code>True</code>."
 msgstr ""
 
 #: ./doc/networking-guide/section_networking_adv_agent.xml:330(title)

doc/user-guide-admin/locale/ja.po

@@ -4,9 +4,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenStack Manuals\n"
-"POT-Creation-Date: 2014-11-16 15:30+0000\n"
+"POT-Creation-Date: 2015-01-03 16:26+0000\n"
-"PO-Revision-Date: 2014-11-17 03:30+0000\n"
+"PO-Revision-Date: 2015-01-02 19:11+0000\n"
-"Last-Translator: Tomoyuki KATO <tomo@dream.daynight.jp>\n"
+"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/openstack-manuals-i18n/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -513,9 +513,9 @@ msgstr "swift クライアントは、使用しやすく、拡張可能かつ柔
 
 #: ./doc/user-guide-admin/section_cli_swift_analyze_log_files.xml9(para)
 msgid ""
-"Use the swift client <option>-o</option> or <option>-output</option> option "
+"Use the swift client <placeholder-1/> or <placeholder-2/> option to get "
-"to get short answers to questions about logs,"
+"short answers to questions about logs,"
-msgstr "ログに関する問い合わせの応答を短縮するために、swift クライアントの <option>-o</option> または <option>-output</option> オプションを使用します。"
+msgstr ""
 
 #: ./doc/user-guide-admin/section_cli_swift_analyze_log_files.xml12(para)
 msgid ""
@@ -575,9 +575,9 @@ msgstr "オブジェクトのダウンロードと分析"
 
 #: ./doc/user-guide-admin/section_cli_swift_analyze_log_files.xml64(para)
 msgid ""
-"This example uses the <option>-o</option> option and a hyphen "
+"This example uses the <placeholder-1/> option and a hyphen "
 "(<literal>-</literal>) to get information about an object."
-msgstr "この例は、オブジェクトに関する情報を取得するために、<option>-o</option> オプションとハイフン (<literal>-</literal>) を使用します。"
+msgstr ""
 
 #: ./doc/user-guide-admin/section_cli_swift_analyze_log_files.xml67(para)
 msgid ""

doc/user-guide-admin/locale/user-guide-admin.pot

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-11-16 06:12+0000\n"
+"POT-Creation-Date: 2015-01-05 06:11+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -366,7 +366,7 @@ msgid "The swift client is simple to use, scalable, and flexible."
 msgstr ""
 
 #: ./doc/user-guide-admin/section_cli_swift_analyze_log_files.xml:9(para)
-msgid "Use the swift client <option>-o</option> or <option>-output</option> option to get short answers to questions about logs,"
+msgid "Use the swift client <placeholder-1/> or <placeholder-2/> option to get short answers to questions about logs,"
 msgstr ""
 
 #: ./doc/user-guide-admin/section_cli_swift_analyze_log_files.xml:12(para)
@@ -418,7 +418,7 @@ msgid "Download and analyze an object"
 msgstr ""
 
 #: ./doc/user-guide-admin/section_cli_swift_analyze_log_files.xml:64(para)
-msgid "This example uses the <option>-o</option> option and a hyphen (<literal>-</literal>) to get information about an object."
+msgid "This example uses the <placeholder-1/> option and a hyphen (<literal>-</literal>) to get information about an object."
 msgstr ""
 
 #: ./doc/user-guide-admin/section_cli_swift_analyze_log_files.xml:67(para)

doc/user-guide/locale/fr.po

@@ -11,8 +11,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenStack Manuals\n"
-"POT-Creation-Date: 2014-12-31 05:36+0000\n"
+"POT-Creation-Date: 2015-01-03 16:26+0000\n"
-"PO-Revision-Date: 2014-12-30 15:53+0000\n"
+"PO-Revision-Date: 2015-01-02 19:11+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/openstack-manuals-i18n/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -5228,8 +5228,8 @@ msgstr "Positionner <replaceable>VALUES</replaceable> comme un dictionnaire JSON
 msgid ""
 "This example creates a configuration group called <literal>group1</literal>."
 " <literal>group1</literal> contains just one key and value pair, and this "
-"pair sets the <option>sync_binlog</option> option to <literal>1</literal>."
+"pair sets the <placeholder-1/> option to <literal>1</literal>."
-msgstr "Cet exemple crée un groupe de configuration appelé <literal>group1</literal>. <literal>group1</literal> contient juste une clé et une valeur et cette paire positionne l'option <option>sync_binlog</option> à <literal>1</literal>. "
+msgstr ""
 
 #: ./doc/user-guide/section_cli_trove.xml660(title)
 msgid "Examine your existing configuration"
@@ -5238,16 +5238,16 @@ msgstr "Examiner votre configuration existante"
 #: ./doc/user-guide/section_cli_trove.xml661(para)
 msgid ""
 "Before you use the newly-created configuration group, look at how the "
-"<option>sync_binlog</option> option is configured on your database. Replace "
+"<placeholder-1/> option is configured on your database. Replace the "
-"the following sample connection values with values that connect to your "
+"following sample connection values with values that connect to your "
 "database:"
-msgstr "Avant que vous n'utilisiez le groupe de configuration nouvellement créé, regarder comment l'option <option>sync_binlog</option> est configurée sur votre base de donnée. Remplacer les valeurs suivantes d'exemple de connexion avec les valeurs qui vous connectent à votre base de donnée."
+msgstr ""
 
 #: ./doc/user-guide/section_cli_trove.xml673(para)
 msgid ""
-"As you can see, the <option>sync_binlog</option> option is currently set to "
+"As you can see, the <placeholder-1/> option is currently set to "
 "<literal>0</literal> for the <literal>myDB7</literal> database."
-msgstr "Comme vous pouvez le voir, l'option <option>sync_binlog</option> est couramment positionnée à <literal>0</literal> pour la base de donnée <literal>myDB7</literal>. "
+msgstr ""
 
 #: ./doc/user-guide/section_cli_trove.xml677(title)
 msgid "Change the database configuration using a configuration group"
@@ -5293,15 +5293,15 @@ msgid "Re-examine the database configuration"
 msgstr "Ré-examiner la configuration de la base de donnée"
 
 #: ./doc/user-guide/section_cli_trove.xml703(para)
-msgid "Display the <option>sync_binlog</option> setting again:"
+msgid "Display the <placeholder-1/> setting again:"
-msgstr "Affiche encore les réglages de <option>sync_binlog</option> :"
+msgstr ""
 
 #: ./doc/user-guide/section_cli_trove.xml710(para)
 msgid ""
-"As you can see, the <option>sync_binlog</option> option is now set to "
+"As you can see, the <placeholder-1/> option is now set to "
 "<literal>1</literal>, as specified in the <literal>group1</literal> "
 "configuration group."
-msgstr "Comme vous pouvez le constater, l'option <option>sync_binlog</option> est maintenant positionnée à <literal>1</literal>, comme spécifié dans le groupe de configuration <literal>group1</literal>. "
+msgstr ""
 
 #: ./doc/user-guide/section_cli_trove.xml716(title)
 msgid "Conclusion"
@@ -5381,8 +5381,8 @@ msgstr ""
 
 #: ./doc/user-guide/section_cli_trove.xml764(para)
 msgid ""
-"When you create a replica, do not specify the <option>--users</option> or "
+"When you create a replica, do not specify the <placeholder-1/> or "
-"<option>--databases</option> options."
+"<placeholder-2/> options."
 msgstr ""
 
 #: ./doc/user-guide/section_cli_trove.xml767(para)
@@ -5415,8 +5415,8 @@ msgstr ""
 #: ./doc/user-guide/section_cli_trove.xml785(para)
 msgid ""
 "Create a new instance that will be a replica of the original instance. You "
-"do this by passing in the <option>--replica_of</option> option with the "
+"do this by passing in the <placeholder-1/> option with the trove "
-"trove <placeholder-1/> command. This example creates a replica called "
+"<placeholder-2/> command. This example creates a replica called "
 "<literal>replica_1</literal>. <literal>replica_1</literal> is a replica of "
 "the original instance, <literal>base_1</literal>:"
 msgstr ""
@@ -5558,11 +5558,10 @@ msgstr ""
 #: ./doc/user-guide/section_cli_trove.xml876(para)
 msgid ""
 "The three instances you want to include in the replication set for the first"
-" shard. Specify each instance by using the <option>--instance</option> "
+" shard. Specify each instance by using the <placeholder-1/> argument and the"
-"argument and the associated flavor ID and volume size. Use the same flavor "
+" associated flavor ID and volume size. Use the same flavor ID and volume "
-"ID and volume size for each instance. In this example, flavor "
+"size for each instance. In this example, flavor <literal>7</literal> is a "
-"<literal>7</literal> is a custom flavor that meets the MongoDB minimum "
+"custom flavor that meets the MongoDB minimum requirements."
-"requirements."
 msgstr ""
 
 #: ./doc/user-guide/section_cli_trove.xml896(title)
@@ -5707,8 +5706,8 @@ msgstr ""
 #: ./doc/user-guide/section_object-api-versioning.xml26(para)
 msgid ""
 "To enable object versioning, ask your cloud provider to set the "
-"<option>allow_versions</option> option to <literal>TRUE</literal> in the "
+"<placeholder-1/> option to <literal>TRUE</literal> in the container "
-"container configuration file."
+"configuration file."
 msgstr ""
 
 #: ./doc/user-guide/section_object-api-versioning.xml32(para)

doc/user-guide/locale/ja.po

@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenStack Manuals\n"
-"POT-Creation-Date: 2014-12-31 05:36+0000\n"
+"POT-Creation-Date: 2015-01-03 16:26+0000\n"
-"PO-Revision-Date: 2014-12-30 15:53+0000\n"
+"PO-Revision-Date: 2015-01-02 19:11+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/openstack-manuals-i18n/language/ja/)\n"
 "MIME-Version: 1.0\n"
@@ -5224,8 +5224,8 @@ msgstr "<replaceable>VALUES</replaceable> を JSON 辞書として設定しま
 msgid ""
 "This example creates a configuration group called <literal>group1</literal>."
 " <literal>group1</literal> contains just one key and value pair, and this "
-"pair sets the <option>sync_binlog</option> option to <literal>1</literal>."
+"pair sets the <placeholder-1/> option to <literal>1</literal>."
-msgstr "この例は、<literal>group1</literal> という名前の設定グループを作成します。<literal>group1</literal> は、1 つのキーと値のペアを持ちます。このペアは、<option>sync_binlog</option> オプションを <literal>1</literal> に設定します。"
+msgstr ""
 
 #: ./doc/user-guide/section_cli_trove.xml660(title)
 msgid "Examine your existing configuration"
@@ -5234,16 +5234,16 @@ msgstr "既存の設定の検査"
 #: ./doc/user-guide/section_cli_trove.xml661(para)
 msgid ""
 "Before you use the newly-created configuration group, look at how the "
-"<option>sync_binlog</option> option is configured on your database. Replace "
+"<placeholder-1/> option is configured on your database. Replace the "
-"the following sample connection values with values that connect to your "
+"following sample connection values with values that connect to your "
 "database:"
-msgstr "新しく作成した設定グループを使用する前に、<option>sync_binlog</option> オプションがデータベースでどのように設定されているかを確認します。以下の接続例の値をお使いのデータベースに接続できる値に置き換えます。"
+msgstr ""
 
 #: ./doc/user-guide/section_cli_trove.xml673(para)
 msgid ""
-"As you can see, the <option>sync_binlog</option> option is currently set to "
+"As you can see, the <placeholder-1/> option is currently set to "
 "<literal>0</literal> for the <literal>myDB7</literal> database."
-msgstr "確認できるように、<literal>myDB7</literal> データベースの <option>sync_binlog</option> オプションが <literal>0</literal> に設定されています。"
+msgstr ""
 
 #: ./doc/user-guide/section_cli_trove.xml677(title)
 msgid "Change the database configuration using a configuration group"
@@ -5289,15 +5289,15 @@ msgid "Re-examine the database configuration"
 msgstr "データベース設定の再検査"
 
 #: ./doc/user-guide/section_cli_trove.xml703(para)
-msgid "Display the <option>sync_binlog</option> setting again:"
+msgid "Display the <placeholder-1/> setting again:"
-msgstr "<option>sync_binlog</option> 設定を再表示します。"
+msgstr ""
 
 #: ./doc/user-guide/section_cli_trove.xml710(para)
 msgid ""
-"As you can see, the <option>sync_binlog</option> option is now set to "
+"As you can see, the <placeholder-1/> option is now set to "
 "<literal>1</literal>, as specified in the <literal>group1</literal> "
 "configuration group."
-msgstr "確認できるように、<literal>group1</literal> 設定グループに設定されているとおり、<option>sync_binlog</option> が <literal>1</literal> に設定されています。"
+msgstr ""
 
 #: ./doc/user-guide/section_cli_trove.xml716(title)
 msgid "Conclusion"
@@ -5377,9 +5377,9 @@ msgstr "レプリカは読み込み専用です。"
 
 #: ./doc/user-guide/section_cli_trove.xml764(para)
 msgid ""
-"When you create a replica, do not specify the <option>--users</option> or "
+"When you create a replica, do not specify the <placeholder-1/> or "
-"<option>--databases</option> options."
+"<placeholder-2/> options."
-msgstr "レプリカの作成時、<option>--users</option> や <option>--databases</option> オプションを指定しないでください。"
+msgstr ""
 
 #: ./doc/user-guide/section_cli_trove.xml767(para)
 msgid ""
@@ -5411,11 +5411,11 @@ msgstr "レプリカの作成"
 #: ./doc/user-guide/section_cli_trove.xml785(para)
 msgid ""
 "Create a new instance that will be a replica of the original instance. You "
-"do this by passing in the <option>--replica_of</option> option with the "
+"do this by passing in the <placeholder-1/> option with the trove "
-"trove <placeholder-1/> command. This example creates a replica called "
+"<placeholder-2/> command. This example creates a replica called "
 "<literal>replica_1</literal>. <literal>replica_1</literal> is a replica of "
 "the original instance, <literal>base_1</literal>:"
-msgstr "元のインスタンスの複製になる、新しいインスタンスを作成します。trove <placeholder-1/> コマンドに <option>--replica_of</option> オプションを渡して実行します。この例は、<literal>replica_1</literal> という名前の複製を作成します。<literal>replica_1</literal> は、元のインスタンス <literal>base_1</literal> の複製です。"
+msgstr ""
 
 #: ./doc/user-guide/section_cli_trove.xml786(replaceable)
 msgid "ID_OF_ORIGINAL_INSTANCE"
@@ -5554,11 +5554,10 @@ msgstr ""
 #: ./doc/user-guide/section_cli_trove.xml876(para)
 msgid ""
 "The three instances you want to include in the replication set for the first"
-" shard. Specify each instance by using the <option>--instance</option> "
+" shard. Specify each instance by using the <placeholder-1/> argument and the"
-"argument and the associated flavor ID and volume size. Use the same flavor "
+" associated flavor ID and volume size. Use the same flavor ID and volume "
-"ID and volume size for each instance. In this example, flavor "
+"size for each instance. In this example, flavor <literal>7</literal> is a "
-"<literal>7</literal> is a custom flavor that meets the MongoDB minimum "
+"custom flavor that meets the MongoDB minimum requirements."
-"requirements."
 msgstr ""
 
 #: ./doc/user-guide/section_cli_trove.xml896(title)
@@ -5703,8 +5702,8 @@ msgstr ""
 #: ./doc/user-guide/section_object-api-versioning.xml26(para)
 msgid ""
 "To enable object versioning, ask your cloud provider to set the "
-"<option>allow_versions</option> option to <literal>TRUE</literal> in the "
+"<placeholder-1/> option to <literal>TRUE</literal> in the container "
-"container configuration file."
+"configuration file."
 msgstr ""
 
 #: ./doc/user-guide/section_object-api-versioning.xml32(para)

doc/user-guide/locale/user-guide.pot

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-12-31 06:13+0000\n"
+"POT-Creation-Date: 2015-01-05 06:11+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3834,7 +3834,7 @@ msgid "Set <replaceable>VALUES</replaceable> as a JSON dictionary, for example:"
 msgstr ""
 
 #: ./doc/user-guide/section_cli_trove.xml:645(para)
-msgid "This example creates a configuration group called <literal>group1</literal>. <literal>group1</literal> contains just one key and value pair, and this pair sets the <option>sync_binlog</option> option to <literal>1</literal>."
+msgid "This example creates a configuration group called <literal>group1</literal>. <literal>group1</literal> contains just one key and value pair, and this pair sets the <placeholder-1/> option to <literal>1</literal>."
 msgstr ""
 
 #: ./doc/user-guide/section_cli_trove.xml:660(title)
@@ -3842,11 +3842,11 @@ msgid "Examine your existing configuration"
 msgstr ""
 
 #: ./doc/user-guide/section_cli_trove.xml:661(para)
-msgid "Before you use the newly-created configuration group, look at how the <option>sync_binlog</option> option is configured on your database. Replace the following sample connection values with values that connect to your database:"
+msgid "Before you use the newly-created configuration group, look at how the <placeholder-1/> option is configured on your database. Replace the following sample connection values with values that connect to your database:"
 msgstr ""
 
 #: ./doc/user-guide/section_cli_trove.xml:673(para)
-msgid "As you can see, the <option>sync_binlog</option> option is currently set to <literal>0</literal> for the <literal>myDB7</literal> database."
+msgid "As you can see, the <placeholder-1/> option is currently set to <literal>0</literal> for the <literal>myDB7</literal> database."
 msgstr ""
 
 #: ./doc/user-guide/section_cli_trove.xml:677(title)
@@ -3886,11 +3886,11 @@ msgid "Re-examine the database configuration"
 msgstr ""
 
 #: ./doc/user-guide/section_cli_trove.xml:703(para)
-msgid "Display the <option>sync_binlog</option> setting again:"
+msgid "Display the <placeholder-1/> setting again:"
 msgstr ""
 
 #: ./doc/user-guide/section_cli_trove.xml:710(para)
-msgid "As you can see, the <option>sync_binlog</option> option is now set to <literal>1</literal>, as specified in the <literal>group1</literal> configuration group."
+msgid "As you can see, the <placeholder-1/> option is now set to <literal>1</literal>, as specified in the <literal>group1</literal> configuration group."
 msgstr ""
 
 #: ./doc/user-guide/section_cli_trove.xml:716(title)
@@ -3950,7 +3950,7 @@ msgid "Replicas are read-only."
 msgstr ""
 
 #: ./doc/user-guide/section_cli_trove.xml:764(para)
-msgid "When you create a replica, do not specify the <option>--users</option> or <option>--databases</option> options."
+msgid "When you create a replica, do not specify the <placeholder-1/> or <placeholder-2/> options."
 msgstr ""
 
 #: ./doc/user-guide/section_cli_trove.xml:767(para)
@@ -3978,7 +3978,7 @@ msgid "Create the replica"
 msgstr ""
 
 #: ./doc/user-guide/section_cli_trove.xml:785(para)
-msgid "Create a new instance that will be a replica of the original instance. You do this by passing in the <option>--replica_of</option> option with the trove <placeholder-1/> command. This example creates a replica called <literal>replica_1</literal>. <literal>replica_1</literal> is a replica of the original instance, <literal>base_1</literal>:"
+msgid "Create a new instance that will be a replica of the original instance. You do this by passing in the <placeholder-1/> option with the trove <placeholder-2/> command. This example creates a replica called <literal>replica_1</literal>. <literal>replica_1</literal> is a replica of the original instance, <literal>base_1</literal>:"
 msgstr ""
 
 #: ./doc/user-guide/section_cli_trove.xml:786(replaceable)
@@ -4086,7 +4086,7 @@ msgid "The name and version of the datastore you want to use."
 msgstr ""
 
 #: ./doc/user-guide/section_cli_trove.xml:876(para)
-msgid "The three instances you want to include in the replication set for the first shard. Specify each instance by using the <option>--instance</option> argument and the associated flavor ID and volume size. Use the same flavor ID and volume size for each instance. In this example, flavor <literal>7</literal> is a custom flavor that meets the MongoDB minimum requirements."
+msgid "The three instances you want to include in the replication set for the first shard. Specify each instance by using the <placeholder-1/> argument and the associated flavor ID and volume size. Use the same flavor ID and volume size for each instance. In this example, flavor <literal>7</literal> is a custom flavor that meets the MongoDB minimum requirements."
 msgstr ""
 
 #: ./doc/user-guide/section_cli_trove.xml:896(title)
@@ -4190,7 +4190,7 @@ msgid "To enable and use object versioning"
 msgstr ""
 
 #: ./doc/user-guide/section_object-api-versioning.xml:26(para)
-msgid "To enable object versioning, ask your cloud provider to set the <option>allow_versions</option> option to <literal>TRUE</literal> in the container configuration file."
+msgid "To enable object versioning, ask your cloud provider to set the <placeholder-1/> option to <literal>TRUE</literal> in the container configuration file."
 msgstr ""
 
 #: ./doc/user-guide/section_object-api-versioning.xml:32(para)