Imported Translations from Transifex

Change-Id: Ib68cbb1f513ced852c91f19d3cad1976bd8ea28d

diff --git a/quantum/locale/bg_BG/LC_MESSAGES/quantum.po b/quantum/locale/bg_BG/LC_MESSAGES/quantum.po
index ee3713f5a4e663c7d364df7a8ab5f981a841f5c9..6252a3455564a850b63d26ac7df1b72787fe3031 100644 (file)
--- a/quantum/locale/bg_BG/LC_MESSAGES/quantum.po
+++ b/quantum/locale/bg_BG/LC_MESSAGES/quantum.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-05-26 12:11+0000\n"
+"POT-Creation-Date: 2013-05-27 12:11+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian (Bulgaria) "
@@ -2235,7 +2235,7 @@ msgid ""
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:594 quantum/plugins/nicira/QuantumPlugin.py:1773
+#: quantum/db/l3_db.py:594 quantum/plugins/nicira/QuantumPlugin.py:1778
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
@@ -2808,7 +2808,7 @@ msgid "Was expecting a dict for service definition, found the following: %s"
 msgstr ""
 
 #: quantum/extensions/servicetype.py:160
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:83
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:86
 #, python-format
 msgid "%s: provided data are not iterable"
 msgstr ""
@@ -2832,47 +2832,47 @@ msgstr ""
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:98
+#: quantum/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:184
+#: quantum/openstack/common/lockutils.py:188
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:195
+#: quantum/openstack/common/lockutils.py:199
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:222
+#: quantum/openstack/common/lockutils.py:226
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:230
+#: quantum/openstack/common/lockutils.py:234
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/log.py:226
+#: quantum/openstack/common/log.py:244
 #, python-format
 msgid "Deprecated: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:329
+#: quantum/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:379
+#: quantum/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:537
+#: quantum/openstack/common/log.py:555
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2895,120 +2895,134 @@ msgstr ""
 msgid "in dynamic looping call"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:41
+#: quantum/openstack/common/periodic_task.py:42
 #, python-format
 msgid "Unexpected argument for periodic task creation: %(arg)s."
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:132
+#: quantum/openstack/common/periodic_task.py:133
 #, python-format
 msgid "Skipping periodic task %(task)s because its interval is negative"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:137
+#: quantum/openstack/common/periodic_task.py:138
 #, python-format
 msgid "Skipping periodic task %(task)s because it is disabled"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:175
+#: quantum/openstack/common/periodic_task.py:176
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:183
+#: quantum/openstack/common/periodic_task.py:184
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:394
+#: quantum/openstack/common/policy.py:395
 #, python-format
 msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:404
+#: quantum/openstack/common/policy.py:405
 #, python-format
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:679
+#: quantum/openstack/common/policy.py:680
 #, python-format
 msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:122
+#: quantum/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:137
+#: quantum/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:162
+#: quantum/openstack/common/processutils.py:167
+#: quantum/openstack/common/processutils.py:240
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:174
+#: quantum/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: quantum/openstack/common/service.py:112
-#: quantum/openstack/common/service.py:275
+#: quantum/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
+#: quantum/openstack/common/processutils.py:221
+msgid "Environment not supported over SSH"
+msgstr ""
+
+#: quantum/openstack/common/processutils.py:225
+msgid "process_input not supported over SSH"
+msgstr ""
+
+#: quantum/openstack/common/service.py:113
+#: quantum/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: quantum/openstack/common/service.py:121
-#: quantum/openstack/common/service.py:218
+#: quantum/openstack/common/service.py:122
+#: quantum/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:164
+#: quantum/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:200
+#: quantum/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: quantum/openstack/common/service.py:223
+#: quantum/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: quantum/openstack/common/service.py:230
+#: quantum/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:240
+#: quantum/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: quantum/openstack/common/service.py:257
+#: quantum/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:261
+#: quantum/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:265
+#: quantum/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
 
-#: quantum/openstack/common/service.py:293
+#: quantum/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: quantum/openstack/common/service.py:304
+#: quantum/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -3054,131 +3068,136 @@ msgstr ""
 
 #: quantum/openstack/common/rpc/amqp.py:200
 #, python-format
-msgid "no calling threads waiting for msg_id : %s, message : %s"
+msgid "no calling threads waiting for msg_id : %(msg_id)s, message : %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:208
+#: quantum/openstack/common/rpc/amqp.py:209
 #, python-format
 msgid ""
 "Number of call waiters is greater than warning threshhold: %d. There "
 "could be a MulticallProxyWaiter leak."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:291
+#: quantum/openstack/common/rpc/amqp.py:292
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:337
+#: quantum/openstack/common/rpc/amqp.py:338
 #, python-format
 msgid "UNIQUE_ID is %s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:406
+#: quantum/openstack/common/rpc/amqp.py:407
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:414
+#: quantum/openstack/common/rpc/amqp.py:415
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:415
+#: quantum/openstack/common/rpc/amqp.py:416
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:443
+#: quantum/openstack/common/rpc/amqp.py:444
 #: quantum/openstack/common/rpc/impl_zmq.py:286
 #, python-format
 msgid "Expected exception during message handling (%s)"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:451
+#: quantum/openstack/common/rpc/amqp.py:452
 #: quantum/openstack/common/rpc/impl_zmq.py:292
 msgid "Exception during message handling"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:586
+#: quantum/openstack/common/rpc/amqp.py:587
 #, python-format
 msgid "Making synchronous call on %s ..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:589
+#: quantum/openstack/common/rpc/amqp.py:590
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:623
+#: quantum/openstack/common/rpc/amqp.py:624
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:632
+#: quantum/openstack/common/rpc/amqp.py:633
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:660
+#: quantum/openstack/common/rpc/amqp.py:661
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:74
+#: quantum/openstack/common/rpc/common.py:75
 msgid "An unknown RPC related exception occurred."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:86
+#: quantum/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:104
+#: quantum/openstack/common/rpc/common.py:105
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:121
+#: quantum/openstack/common/rpc/common.py:122
 #, python-format
 msgid ""
 "Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:"
 " \"%(method)s\" info: \"%(info)s\""
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:137
 #: quantum/openstack/common/rpc/common.py:138
 #: quantum/openstack/common/rpc/common.py:139
+#: quantum/openstack/common/rpc/common.py:140
 msgid "<unknown>"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:143
+#: quantum/openstack/common/rpc/common.py:144
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:147
+#: quantum/openstack/common/rpc/common.py:148
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:151
+#: quantum/openstack/common/rpc/common.py:152
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:156
+#: quantum/openstack/common/rpc/common.py:157
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:280
+#: quantum/openstack/common/rpc/common.py:162
+#, python-format
+msgid "Specified RPC version cap, %(version_cap)s, is too low"
+msgstr ""
+
+#: quantum/openstack/common/rpc/common.py:285
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:302
+#: quantum/openstack/common/rpc/common.py:307
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
@@ -3441,25 +3460,30 @@ msgstr ""
 msgid "No match from matchmaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:53
+#: quantum/openstack/common/rpc/impl_zmq.py:852
+#, python-format
+msgid "rpc_zmq_matchmaker = %(orig)s is deprecated; use %(new)s instead"
+msgstr ""
+
+#: quantum/openstack/common/rpc/matchmaker.py:47
 msgid "Match not found by MatchMaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:89
+#: quantum/openstack/common/rpc/matchmaker.py:83
 msgid "Matchmaker does not implement registration or heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:239
+#: quantum/openstack/common/rpc/matchmaker.py:233
 #, python-format
-msgid "Matchmaker unregistered: %s, %s"
+msgid "Matchmaker unregistered: %(key)s, %(host)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:250
+#: quantum/openstack/common/rpc/matchmaker.py:245
 msgid "Register before starting heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:343
-#: quantum/openstack/common/rpc/matchmaker.py:361
+#: quantum/openstack/common/rpc/matchmaker_ring.py:81
+#: quantum/openstack/common/rpc/matchmaker_ring.py:99
 #, python-format
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
@@ -5124,7 +5148,7 @@ msgstr ""
 #: quantum/plugins/midonet/midonet_lib.py:278
 #, python-format
 msgid ""
-"RuleManager.create_for_sg_rule: adding accept rule %(rule_id) in "
+"RuleManager.create_for_sg_rule: adding accept rule %(rule_id)s in "
 "portgroup %(port_group_id)s"
 msgstr ""
 
@@ -5222,7 +5246,7 @@ msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
 #: quantum/plugins/midonet/plugin.py:319
-#: quantum/plugins/nicira/QuantumPlugin.py:1025
+#: quantum/plugins/nicira/QuantumPlugin.py:1030
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
@@ -6089,408 +6113,408 @@ msgstr ""
 msgid "The request has timed out."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:223
+#: quantum/plugins/nicira/QuantumPlugin.py:228
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:258
+#: quantum/plugins/nicira/QuantumPlugin.py:263
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:260
+#: quantum/plugins/nicira/QuantumPlugin.py:265
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:263
+#: quantum/plugins/nicira/QuantumPlugin.py:268
 #, python-format
 msgid ""
 "Unable to create logical router port for quantum port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:285
+#: quantum/plugins/nicira/QuantumPlugin.py:290
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:291
+#: quantum/plugins/nicira/QuantumPlugin.py:296
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
 "associated with Quantum %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:297
+#: quantum/plugins/nicira/QuantumPlugin.py:302
 #, python-format
 msgid ""
 "Unable to plug attachment in router port %(r_port_id)s for quantum port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:342
+#: quantum/plugins/nicira/QuantumPlugin.py:347
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:367
-#: quantum/plugins/nicira/QuantumPlugin.py:402
-#: quantum/plugins/nicira/QuantumPlugin.py:592
+#: quantum/plugins/nicira/QuantumPlugin.py:372
+#: quantum/plugins/nicira/QuantumPlugin.py:407
+#: quantum/plugins/nicira/QuantumPlugin.py:597
 #, python-format
 msgid ""
 "NVP plugin does not support regular VIF ports on external networks. Port "
 "%s will be down."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:387
-#: quantum/plugins/nicira/QuantumPlugin.py:468
-#: quantum/plugins/nicira/QuantumPlugin.py:612
+#: quantum/plugins/nicira/QuantumPlugin.py:392
+#: quantum/plugins/nicira/QuantumPlugin.py:473
+#: quantum/plugins/nicira/QuantumPlugin.py:617
 #, python-format
 msgid ""
 "_nvp_create_port completed for port %(name)s on network %(network_id)s. "
 "The new port id is %(id)s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:391
+#: quantum/plugins/nicira/QuantumPlugin.py:396
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:409
+#: quantum/plugins/nicira/QuantumPlugin.py:414
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:418
+#: quantum/plugins/nicira/QuantumPlugin.py:423
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:424
+#: quantum/plugins/nicira/QuantumPlugin.py:429
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:443
-#: quantum/plugins/nicira/QuantumPlugin.py:876
+#: quantum/plugins/nicira/QuantumPlugin.py:448
+#: quantum/plugins/nicira/QuantumPlugin.py:881
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:455
+#: quantum/plugins/nicira/QuantumPlugin.py:460
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:473
+#: quantum/plugins/nicira/QuantumPlugin.py:478
 msgid "An exception occured while plugging the interface"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:481
+#: quantum/plugins/nicira/QuantumPlugin.py:486
 #, python-format
 msgid ""
 "device_id field must be populated in order to create an external gateway "
 "port for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:489
+#: quantum/plugins/nicira/QuantumPlugin.py:494
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:535
+#: quantum/plugins/nicira/QuantumPlugin.py:540
 #, python-format
 msgid ""
 "_nvp_create_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s. NVP port id is %(nvp_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:573
+#: quantum/plugins/nicira/QuantumPlugin.py:578
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:577
-#: quantum/plugins/nicira/QuantumPlugin.py:1718
+#: quantum/plugins/nicira/QuantumPlugin.py:582
+#: quantum/plugins/nicira/QuantumPlugin.py:1723
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:579
+#: quantum/plugins/nicira/QuantumPlugin.py:584
 #, python-format
 msgid ""
 "_nvp_delete_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:617
+#: quantum/plugins/nicira/QuantumPlugin.py:622
 #, python-format
 msgid "An exception occured while plugging the gateway interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:657
+#: quantum/plugins/nicira/QuantumPlugin.py:662
 #, python-format
 msgid "Unable to find NVP uuid for Quantum port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:686
+#: quantum/plugins/nicira/QuantumPlugin.py:691
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:690
+#: quantum/plugins/nicira/QuantumPlugin.py:695
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:694
+#: quantum/plugins/nicira/QuantumPlugin.py:699
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:698
-#: quantum/plugins/nicira/QuantumPlugin.py:713
+#: quantum/plugins/nicira/QuantumPlugin.py:703
+#: quantum/plugins/nicira/QuantumPlugin.py:718
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:719
+#: quantum/plugins/nicira/QuantumPlugin.py:724
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:750
+#: quantum/plugins/nicira/QuantumPlugin.py:755
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:772
+#: quantum/plugins/nicira/QuantumPlugin.py:777
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:799
+#: quantum/plugins/nicira/QuantumPlugin.py:804
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not yet supported by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:858
+#: quantum/plugins/nicira/QuantumPlugin.py:863
 #, python-format
 msgid "A nvp lport identifier was not found for quantum port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:886
+#: quantum/plugins/nicira/QuantumPlugin.py:891
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:889
+#: quantum/plugins/nicira/QuantumPlugin.py:894
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:915
+#: quantum/plugins/nicira/QuantumPlugin.py:920
 #, python-format
 msgid ""
 "Current network status:%(nvp_net_status)s; Status in Quantum "
 "DB:%(quantum_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:925
-#: quantum/plugins/nicira/QuantumPlugin.py:975
+#: quantum/plugins/nicira/QuantumPlugin.py:930
+#: quantum/plugins/nicira/QuantumPlugin.py:980
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:989
+#: quantum/plugins/nicira/QuantumPlugin.py:994
 #, python-format
 msgid "Logical Switch %s found in quantum database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1004
+#: quantum/plugins/nicira/QuantumPlugin.py:1009
 #, python-format
 msgid ""
 "Found %s logical switches not bound to Quantum networks. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1008
+#: quantum/plugins/nicira/QuantumPlugin.py:1013
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1091
+#: quantum/plugins/nicira/QuantumPlugin.py:1096
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1100
+#: quantum/plugins/nicira/QuantumPlugin.py:1105
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1127
+#: quantum/plugins/nicira/QuantumPlugin.py:1132
 #, python-format
 msgid "Quantum logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1134
+#: quantum/plugins/nicira/QuantumPlugin.py:1139
 #, python-format
 msgid ""
 "Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1196
+#: quantum/plugins/nicira/QuantumPlugin.py:1201
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1202
+#: quantum/plugins/nicira/QuantumPlugin.py:1207
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1207
+#: quantum/plugins/nicira/QuantumPlugin.py:1212
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1271
+#: quantum/plugins/nicira/QuantumPlugin.py:1276
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1296
+#: quantum/plugins/nicira/QuantumPlugin.py:1301
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1410
-#: quantum/plugins/nicira/QuantumPlugin.py:1455
+#: quantum/plugins/nicira/QuantumPlugin.py:1415
+#: quantum/plugins/nicira/QuantumPlugin.py:1460
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1423
+#: quantum/plugins/nicira/QuantumPlugin.py:1428
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1465
+#: quantum/plugins/nicira/QuantumPlugin.py:1470
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1468
+#: quantum/plugins/nicira/QuantumPlugin.py:1473
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1488
+#: quantum/plugins/nicira/QuantumPlugin.py:1493
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1492
+#: quantum/plugins/nicira/QuantumPlugin.py:1497
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1513
+#: quantum/plugins/nicira/QuantumPlugin.py:1518
 #, python-format
 msgid ""
 "Current router status:%(router_status)s;Status in Quantum "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1521
+#: quantum/plugins/nicira/QuantumPlugin.py:1526
 msgid "Unable to get logical router"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1544
+#: quantum/plugins/nicira/QuantumPlugin.py:1549
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1566
+#: quantum/plugins/nicira/QuantumPlugin.py:1571
 #, python-format
 msgid ""
 "Found %s logical routers not bound to Quantum routers. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1593
+#: quantum/plugins/nicira/QuantumPlugin.py:1598
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1628
+#: quantum/plugins/nicira/QuantumPlugin.py:1633
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1673
+#: quantum/plugins/nicira/QuantumPlugin.py:1678
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1685
+#: quantum/plugins/nicira/QuantumPlugin.py:1690
 #, python-format
 msgid ""
 "Unable to find NVP logical router port for Quantum port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1714
+#: quantum/plugins/nicira/QuantumPlugin.py:1719
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1740
+#: quantum/plugins/nicira/QuantumPlugin.py:1745
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1746
+#: quantum/plugins/nicira/QuantumPlugin.py:1751
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1812
+#: quantum/plugins/nicira/QuantumPlugin.py:1817
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1836
+#: quantum/plugins/nicira/QuantumPlugin.py:1841
 #, python-format
 msgid ""
 "An error occurred while creating NAT rules on the NVP platform for "
 "floating ip:%(floating_ip)s mapped to internal ip:%(internal_ip)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1878
+#: quantum/plugins/nicira/QuantumPlugin.py:1883
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1881
+#: quantum/plugins/nicira/QuantumPlugin.py:1886
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1907
+#: quantum/plugins/nicira/QuantumPlugin.py:1912
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1929
+#: quantum/plugins/nicira/QuantumPlugin.py:1934
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
@@ -6536,69 +6560,69 @@ msgstr ""
 msgid "The network gateway %(gateway_id)s cannot be updated or deleted"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:152
+#: quantum/plugins/nicira/nicira_networkgw_db.py:160
 msgid ""
 "A network identifier must be specified when connecting a network to a "
 "network gateway. Unable to complete operation"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:158
+#: quantum/plugins/nicira/nicira_networkgw_db.py:166
 #, python-format
 msgid ""
 "Invalid keys found among the ones provided in request body: "
 "%(connection_attrs)s."
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:164
+#: quantum/plugins/nicira/nicira_networkgw_db.py:172
 msgid ""
 "In order to specify a segmentation id the segmentation type must be "
 "specified as well"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:168
+#: quantum/plugins/nicira/nicira_networkgw_db.py:176
 msgid "Cannot specify a segmentation id when the segmentation type is flat"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:217
+#: quantum/plugins/nicira/nicira_networkgw_db.py:225
 #, python-format
 msgid "Created network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:230
+#: quantum/plugins/nicira/nicira_networkgw_db.py:237
 #, python-format
 msgid "Updated network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:245
+#: quantum/plugins/nicira/nicira_networkgw_db.py:252
 #, python-format
 msgid "Network gateway '%s' was destroyed."
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:255
+#: quantum/plugins/nicira/nicira_networkgw_db.py:262
 #, python-format
 msgid "Connecting network '%(network_id)s' to gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:296
+#: quantum/plugins/nicira/nicira_networkgw_db.py:303
 #, python-format
 msgid ""
 "Requested network '%(network_id)s' not found.Unable to create network "
 "connection on gateway '%(network_gateway_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:304
+#: quantum/plugins/nicira/nicira_networkgw_db.py:311
 #, python-format
 msgid ""
 "Gateway port for '%(network_gateway_id)s' created on network "
 "'%(network_id)s':%(port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:320
+#: quantum/plugins/nicira/nicira_networkgw_db.py:327
 #, python-format
 msgid "Ensured no Ip addresses are configured on port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:330
+#: quantum/plugins/nicira/nicira_networkgw_db.py:337
 #, python-format
 msgid ""
 "Disconnecting network '%(network_id)s' from gateway "
@@ -7229,11 +7253,11 @@ msgid ""
 "router:'%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:63
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:66
 msgid "Cannot create a gateway with an empty device list"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:89
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:92
 msgid "number of network gateways allowed per tenant, -1 for unlimited"
 msgstr ""
 
@@ -7970,3 +7994,14 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
+#~ msgid "no calling threads waiting for msg_id : %s, message : %s"
+#~ msgstr ""
+
+#~ msgid "Matchmaker unregistered: %s, %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "RuleManager.create_for_sg_rule: adding accept rule"
+#~ " %(rule_id) in portgroup %(port_group_id)s"
+#~ msgstr ""
+

diff --git a/quantum/locale/cs/LC_MESSAGES/quantum.po b/quantum/locale/cs/LC_MESSAGES/quantum.po
index cbc35130f43d15539f2a74b60838d07facd22f83..27e30961ea82c4cd2f0f6c19f452a7be0ccd6acb 100644 (file)
--- a/quantum/locale/cs/LC_MESSAGES/quantum.po
+++ b/quantum/locale/cs/LC_MESSAGES/quantum.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-05-26 12:11+0000\n"
+"POT-Creation-Date: 2013-05-27 12:11+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Czech "
@@ -2235,7 +2235,7 @@ msgid ""
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:594 quantum/plugins/nicira/QuantumPlugin.py:1773
+#: quantum/db/l3_db.py:594 quantum/plugins/nicira/QuantumPlugin.py:1778
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
@@ -2808,7 +2808,7 @@ msgid "Was expecting a dict for service definition, found the following: %s"
 msgstr ""
 
 #: quantum/extensions/servicetype.py:160
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:83
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:86
 #, python-format
 msgid "%s: provided data are not iterable"
 msgstr ""
@@ -2832,47 +2832,47 @@ msgstr ""
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:98
+#: quantum/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:184
+#: quantum/openstack/common/lockutils.py:188
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:195
+#: quantum/openstack/common/lockutils.py:199
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:222
+#: quantum/openstack/common/lockutils.py:226
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:230
+#: quantum/openstack/common/lockutils.py:234
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/log.py:226
+#: quantum/openstack/common/log.py:244
 #, python-format
 msgid "Deprecated: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:329
+#: quantum/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:379
+#: quantum/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:537
+#: quantum/openstack/common/log.py:555
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2895,120 +2895,134 @@ msgstr ""
 msgid "in dynamic looping call"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:41
+#: quantum/openstack/common/periodic_task.py:42
 #, python-format
 msgid "Unexpected argument for periodic task creation: %(arg)s."
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:132
+#: quantum/openstack/common/periodic_task.py:133
 #, python-format
 msgid "Skipping periodic task %(task)s because its interval is negative"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:137
+#: quantum/openstack/common/periodic_task.py:138
 #, python-format
 msgid "Skipping periodic task %(task)s because it is disabled"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:175
+#: quantum/openstack/common/periodic_task.py:176
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:183
+#: quantum/openstack/common/periodic_task.py:184
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:394
+#: quantum/openstack/common/policy.py:395
 #, python-format
 msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:404
+#: quantum/openstack/common/policy.py:405
 #, python-format
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:679
+#: quantum/openstack/common/policy.py:680
 #, python-format
 msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:122
+#: quantum/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:137
+#: quantum/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:162
+#: quantum/openstack/common/processutils.py:167
+#: quantum/openstack/common/processutils.py:240
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:174
+#: quantum/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: quantum/openstack/common/service.py:112
-#: quantum/openstack/common/service.py:275
+#: quantum/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
+#: quantum/openstack/common/processutils.py:221
+msgid "Environment not supported over SSH"
+msgstr ""
+
+#: quantum/openstack/common/processutils.py:225
+msgid "process_input not supported over SSH"
+msgstr ""
+
+#: quantum/openstack/common/service.py:113
+#: quantum/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: quantum/openstack/common/service.py:121
-#: quantum/openstack/common/service.py:218
+#: quantum/openstack/common/service.py:122
+#: quantum/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:164
+#: quantum/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:200
+#: quantum/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: quantum/openstack/common/service.py:223
+#: quantum/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: quantum/openstack/common/service.py:230
+#: quantum/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:240
+#: quantum/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: quantum/openstack/common/service.py:257
+#: quantum/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:261
+#: quantum/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:265
+#: quantum/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
 
-#: quantum/openstack/common/service.py:293
+#: quantum/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: quantum/openstack/common/service.py:304
+#: quantum/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -3054,131 +3068,136 @@ msgstr ""
 
 #: quantum/openstack/common/rpc/amqp.py:200
 #, python-format
-msgid "no calling threads waiting for msg_id : %s, message : %s"
+msgid "no calling threads waiting for msg_id : %(msg_id)s, message : %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:208
+#: quantum/openstack/common/rpc/amqp.py:209
 #, python-format
 msgid ""
 "Number of call waiters is greater than warning threshhold: %d. There "
 "could be a MulticallProxyWaiter leak."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:291
+#: quantum/openstack/common/rpc/amqp.py:292
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:337
+#: quantum/openstack/common/rpc/amqp.py:338
 #, python-format
 msgid "UNIQUE_ID is %s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:406
+#: quantum/openstack/common/rpc/amqp.py:407
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:414
+#: quantum/openstack/common/rpc/amqp.py:415
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:415
+#: quantum/openstack/common/rpc/amqp.py:416
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:443
+#: quantum/openstack/common/rpc/amqp.py:444
 #: quantum/openstack/common/rpc/impl_zmq.py:286
 #, python-format
 msgid "Expected exception during message handling (%s)"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:451
+#: quantum/openstack/common/rpc/amqp.py:452
 #: quantum/openstack/common/rpc/impl_zmq.py:292
 msgid "Exception during message handling"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:586
+#: quantum/openstack/common/rpc/amqp.py:587
 #, python-format
 msgid "Making synchronous call on %s ..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:589
+#: quantum/openstack/common/rpc/amqp.py:590
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:623
+#: quantum/openstack/common/rpc/amqp.py:624
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:632
+#: quantum/openstack/common/rpc/amqp.py:633
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:660
+#: quantum/openstack/common/rpc/amqp.py:661
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:74
+#: quantum/openstack/common/rpc/common.py:75
 msgid "An unknown RPC related exception occurred."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:86
+#: quantum/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:104
+#: quantum/openstack/common/rpc/common.py:105
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:121
+#: quantum/openstack/common/rpc/common.py:122
 #, python-format
 msgid ""
 "Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:"
 " \"%(method)s\" info: \"%(info)s\""
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:137
 #: quantum/openstack/common/rpc/common.py:138
 #: quantum/openstack/common/rpc/common.py:139
+#: quantum/openstack/common/rpc/common.py:140
 msgid "<unknown>"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:143
+#: quantum/openstack/common/rpc/common.py:144
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:147
+#: quantum/openstack/common/rpc/common.py:148
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:151
+#: quantum/openstack/common/rpc/common.py:152
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:156
+#: quantum/openstack/common/rpc/common.py:157
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:280
+#: quantum/openstack/common/rpc/common.py:162
+#, python-format
+msgid "Specified RPC version cap, %(version_cap)s, is too low"
+msgstr ""
+
+#: quantum/openstack/common/rpc/common.py:285
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:302
+#: quantum/openstack/common/rpc/common.py:307
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
@@ -3441,25 +3460,30 @@ msgstr ""
 msgid "No match from matchmaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:53
+#: quantum/openstack/common/rpc/impl_zmq.py:852
+#, python-format
+msgid "rpc_zmq_matchmaker = %(orig)s is deprecated; use %(new)s instead"
+msgstr ""
+
+#: quantum/openstack/common/rpc/matchmaker.py:47
 msgid "Match not found by MatchMaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:89
+#: quantum/openstack/common/rpc/matchmaker.py:83
 msgid "Matchmaker does not implement registration or heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:239
+#: quantum/openstack/common/rpc/matchmaker.py:233
 #, python-format
-msgid "Matchmaker unregistered: %s, %s"
+msgid "Matchmaker unregistered: %(key)s, %(host)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:250
+#: quantum/openstack/common/rpc/matchmaker.py:245
 msgid "Register before starting heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:343
-#: quantum/openstack/common/rpc/matchmaker.py:361
+#: quantum/openstack/common/rpc/matchmaker_ring.py:81
+#: quantum/openstack/common/rpc/matchmaker_ring.py:99
 #, python-format
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
@@ -5124,7 +5148,7 @@ msgstr ""
 #: quantum/plugins/midonet/midonet_lib.py:278
 #, python-format
 msgid ""
-"RuleManager.create_for_sg_rule: adding accept rule %(rule_id) in "
+"RuleManager.create_for_sg_rule: adding accept rule %(rule_id)s in "
 "portgroup %(port_group_id)s"
 msgstr ""
 
@@ -5222,7 +5246,7 @@ msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
 #: quantum/plugins/midonet/plugin.py:319
-#: quantum/plugins/nicira/QuantumPlugin.py:1025
+#: quantum/plugins/nicira/QuantumPlugin.py:1030
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
@@ -6089,408 +6113,408 @@ msgstr ""
 msgid "The request has timed out."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:223
+#: quantum/plugins/nicira/QuantumPlugin.py:228
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:258
+#: quantum/plugins/nicira/QuantumPlugin.py:263
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:260
+#: quantum/plugins/nicira/QuantumPlugin.py:265
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:263
+#: quantum/plugins/nicira/QuantumPlugin.py:268
 #, python-format
 msgid ""
 "Unable to create logical router port for quantum port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:285
+#: quantum/plugins/nicira/QuantumPlugin.py:290
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:291
+#: quantum/plugins/nicira/QuantumPlugin.py:296
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
 "associated with Quantum %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:297
+#: quantum/plugins/nicira/QuantumPlugin.py:302
 #, python-format
 msgid ""
 "Unable to plug attachment in router port %(r_port_id)s for quantum port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:342
+#: quantum/plugins/nicira/QuantumPlugin.py:347
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:367
-#: quantum/plugins/nicira/QuantumPlugin.py:402
-#: quantum/plugins/nicira/QuantumPlugin.py:592
+#: quantum/plugins/nicira/QuantumPlugin.py:372
+#: quantum/plugins/nicira/QuantumPlugin.py:407
+#: quantum/plugins/nicira/QuantumPlugin.py:597
 #, python-format
 msgid ""
 "NVP plugin does not support regular VIF ports on external networks. Port "
 "%s will be down."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:387
-#: quantum/plugins/nicira/QuantumPlugin.py:468
-#: quantum/plugins/nicira/QuantumPlugin.py:612
+#: quantum/plugins/nicira/QuantumPlugin.py:392
+#: quantum/plugins/nicira/QuantumPlugin.py:473
+#: quantum/plugins/nicira/QuantumPlugin.py:617
 #, python-format
 msgid ""
 "_nvp_create_port completed for port %(name)s on network %(network_id)s. "
 "The new port id is %(id)s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:391
+#: quantum/plugins/nicira/QuantumPlugin.py:396
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:409
+#: quantum/plugins/nicira/QuantumPlugin.py:414
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:418
+#: quantum/plugins/nicira/QuantumPlugin.py:423
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:424
+#: quantum/plugins/nicira/QuantumPlugin.py:429
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:443
-#: quantum/plugins/nicira/QuantumPlugin.py:876
+#: quantum/plugins/nicira/QuantumPlugin.py:448
+#: quantum/plugins/nicira/QuantumPlugin.py:881
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:455
+#: quantum/plugins/nicira/QuantumPlugin.py:460
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:473
+#: quantum/plugins/nicira/QuantumPlugin.py:478
 msgid "An exception occured while plugging the interface"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:481
+#: quantum/plugins/nicira/QuantumPlugin.py:486
 #, python-format
 msgid ""
 "device_id field must be populated in order to create an external gateway "
 "port for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:489
+#: quantum/plugins/nicira/QuantumPlugin.py:494
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:535
+#: quantum/plugins/nicira/QuantumPlugin.py:540
 #, python-format
 msgid ""
 "_nvp_create_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s. NVP port id is %(nvp_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:573
+#: quantum/plugins/nicira/QuantumPlugin.py:578
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:577
-#: quantum/plugins/nicira/QuantumPlugin.py:1718
+#: quantum/plugins/nicira/QuantumPlugin.py:582
+#: quantum/plugins/nicira/QuantumPlugin.py:1723
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:579
+#: quantum/plugins/nicira/QuantumPlugin.py:584
 #, python-format
 msgid ""
 "_nvp_delete_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:617
+#: quantum/plugins/nicira/QuantumPlugin.py:622
 #, python-format
 msgid "An exception occured while plugging the gateway interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:657
+#: quantum/plugins/nicira/QuantumPlugin.py:662
 #, python-format
 msgid "Unable to find NVP uuid for Quantum port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:686
+#: quantum/plugins/nicira/QuantumPlugin.py:691
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:690
+#: quantum/plugins/nicira/QuantumPlugin.py:695
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:694
+#: quantum/plugins/nicira/QuantumPlugin.py:699
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:698
-#: quantum/plugins/nicira/QuantumPlugin.py:713
+#: quantum/plugins/nicira/QuantumPlugin.py:703
+#: quantum/plugins/nicira/QuantumPlugin.py:718
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:719
+#: quantum/plugins/nicira/QuantumPlugin.py:724
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:750
+#: quantum/plugins/nicira/QuantumPlugin.py:755
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:772
+#: quantum/plugins/nicira/QuantumPlugin.py:777
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:799
+#: quantum/plugins/nicira/QuantumPlugin.py:804
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not yet supported by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:858
+#: quantum/plugins/nicira/QuantumPlugin.py:863
 #, python-format
 msgid "A nvp lport identifier was not found for quantum port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:886
+#: quantum/plugins/nicira/QuantumPlugin.py:891
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:889
+#: quantum/plugins/nicira/QuantumPlugin.py:894
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:915
+#: quantum/plugins/nicira/QuantumPlugin.py:920
 #, python-format
 msgid ""
 "Current network status:%(nvp_net_status)s; Status in Quantum "
 "DB:%(quantum_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:925
-#: quantum/plugins/nicira/QuantumPlugin.py:975
+#: quantum/plugins/nicira/QuantumPlugin.py:930
+#: quantum/plugins/nicira/QuantumPlugin.py:980
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:989
+#: quantum/plugins/nicira/QuantumPlugin.py:994
 #, python-format
 msgid "Logical Switch %s found in quantum database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1004
+#: quantum/plugins/nicira/QuantumPlugin.py:1009
 #, python-format
 msgid ""
 "Found %s logical switches not bound to Quantum networks. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1008
+#: quantum/plugins/nicira/QuantumPlugin.py:1013
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1091
+#: quantum/plugins/nicira/QuantumPlugin.py:1096
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1100
+#: quantum/plugins/nicira/QuantumPlugin.py:1105
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1127
+#: quantum/plugins/nicira/QuantumPlugin.py:1132
 #, python-format
 msgid "Quantum logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1134
+#: quantum/plugins/nicira/QuantumPlugin.py:1139
 #, python-format
 msgid ""
 "Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1196
+#: quantum/plugins/nicira/QuantumPlugin.py:1201
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1202
+#: quantum/plugins/nicira/QuantumPlugin.py:1207
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1207
+#: quantum/plugins/nicira/QuantumPlugin.py:1212
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1271
+#: quantum/plugins/nicira/QuantumPlugin.py:1276
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1296
+#: quantum/plugins/nicira/QuantumPlugin.py:1301
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1410
-#: quantum/plugins/nicira/QuantumPlugin.py:1455
+#: quantum/plugins/nicira/QuantumPlugin.py:1415
+#: quantum/plugins/nicira/QuantumPlugin.py:1460
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1423
+#: quantum/plugins/nicira/QuantumPlugin.py:1428
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1465
+#: quantum/plugins/nicira/QuantumPlugin.py:1470
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1468
+#: quantum/plugins/nicira/QuantumPlugin.py:1473
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1488
+#: quantum/plugins/nicira/QuantumPlugin.py:1493
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1492
+#: quantum/plugins/nicira/QuantumPlugin.py:1497
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1513
+#: quantum/plugins/nicira/QuantumPlugin.py:1518
 #, python-format
 msgid ""
 "Current router status:%(router_status)s;Status in Quantum "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1521
+#: quantum/plugins/nicira/QuantumPlugin.py:1526
 msgid "Unable to get logical router"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1544
+#: quantum/plugins/nicira/QuantumPlugin.py:1549
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1566
+#: quantum/plugins/nicira/QuantumPlugin.py:1571
 #, python-format
 msgid ""
 "Found %s logical routers not bound to Quantum routers. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1593
+#: quantum/plugins/nicira/QuantumPlugin.py:1598
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1628
+#: quantum/plugins/nicira/QuantumPlugin.py:1633
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1673
+#: quantum/plugins/nicira/QuantumPlugin.py:1678
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1685
+#: quantum/plugins/nicira/QuantumPlugin.py:1690
 #, python-format
 msgid ""
 "Unable to find NVP logical router port for Quantum port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1714
+#: quantum/plugins/nicira/QuantumPlugin.py:1719
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1740
+#: quantum/plugins/nicira/QuantumPlugin.py:1745
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1746
+#: quantum/plugins/nicira/QuantumPlugin.py:1751
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1812
+#: quantum/plugins/nicira/QuantumPlugin.py:1817
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1836
+#: quantum/plugins/nicira/QuantumPlugin.py:1841
 #, python-format
 msgid ""
 "An error occurred while creating NAT rules on the NVP platform for "
 "floating ip:%(floating_ip)s mapped to internal ip:%(internal_ip)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1878
+#: quantum/plugins/nicira/QuantumPlugin.py:1883
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1881
+#: quantum/plugins/nicira/QuantumPlugin.py:1886
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1907
+#: quantum/plugins/nicira/QuantumPlugin.py:1912
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1929
+#: quantum/plugins/nicira/QuantumPlugin.py:1934
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
@@ -6536,69 +6560,69 @@ msgstr ""
 msgid "The network gateway %(gateway_id)s cannot be updated or deleted"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:152
+#: quantum/plugins/nicira/nicira_networkgw_db.py:160
 msgid ""
 "A network identifier must be specified when connecting a network to a "
 "network gateway. Unable to complete operation"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:158
+#: quantum/plugins/nicira/nicira_networkgw_db.py:166
 #, python-format
 msgid ""
 "Invalid keys found among the ones provided in request body: "
 "%(connection_attrs)s."
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:164
+#: quantum/plugins/nicira/nicira_networkgw_db.py:172
 msgid ""
 "In order to specify a segmentation id the segmentation type must be "
 "specified as well"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:168
+#: quantum/plugins/nicira/nicira_networkgw_db.py:176
 msgid "Cannot specify a segmentation id when the segmentation type is flat"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:217
+#: quantum/plugins/nicira/nicira_networkgw_db.py:225
 #, python-format
 msgid "Created network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:230
+#: quantum/plugins/nicira/nicira_networkgw_db.py:237
 #, python-format
 msgid "Updated network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:245
+#: quantum/plugins/nicira/nicira_networkgw_db.py:252
 #, python-format
 msgid "Network gateway '%s' was destroyed."
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:255
+#: quantum/plugins/nicira/nicira_networkgw_db.py:262
 #, python-format
 msgid "Connecting network '%(network_id)s' to gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:296
+#: quantum/plugins/nicira/nicira_networkgw_db.py:303
 #, python-format
 msgid ""
 "Requested network '%(network_id)s' not found.Unable to create network "
 "connection on gateway '%(network_gateway_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:304
+#: quantum/plugins/nicira/nicira_networkgw_db.py:311
 #, python-format
 msgid ""
 "Gateway port for '%(network_gateway_id)s' created on network "
 "'%(network_id)s':%(port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:320
+#: quantum/plugins/nicira/nicira_networkgw_db.py:327
 #, python-format
 msgid "Ensured no Ip addresses are configured on port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:330
+#: quantum/plugins/nicira/nicira_networkgw_db.py:337
 #, python-format
 msgid ""
 "Disconnecting network '%(network_id)s' from gateway "
@@ -7229,11 +7253,11 @@ msgid ""
 "router:'%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:63
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:66
 msgid "Cannot create a gateway with an empty device list"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:89
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:92
 msgid "number of network gateways allowed per tenant, -1 for unlimited"
 msgstr ""
 
@@ -7970,3 +7994,14 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
+#~ msgid "no calling threads waiting for msg_id : %s, message : %s"
+#~ msgstr ""
+
+#~ msgid "Matchmaker unregistered: %s, %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "RuleManager.create_for_sg_rule: adding accept rule"
+#~ " %(rule_id) in portgroup %(port_group_id)s"
+#~ msgstr ""
+

diff --git a/quantum/locale/da/LC_MESSAGES/quantum.po b/quantum/locale/da/LC_MESSAGES/quantum.po
index 483dfa9750a4077d1336b8748533369bec894c0d..1411fdde73d1e8c7459affc10a1004516a18fdff 100644 (file)
--- a/quantum/locale/da/LC_MESSAGES/quantum.po
+++ b/quantum/locale/da/LC_MESSAGES/quantum.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-05-26 12:11+0000\n"
+"POT-Creation-Date: 2013-05-27 12:11+0000\n"
 "PO-Revision-Date: 2013-05-16 09:23+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Danish "
@@ -2235,7 +2235,7 @@ msgid ""
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:594 quantum/plugins/nicira/QuantumPlugin.py:1773
+#: quantum/db/l3_db.py:594 quantum/plugins/nicira/QuantumPlugin.py:1778
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
@@ -2808,7 +2808,7 @@ msgid "Was expecting a dict for service definition, found the following: %s"
 msgstr ""
 
 #: quantum/extensions/servicetype.py:160
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:83
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:86
 #, python-format
 msgid "%s: provided data are not iterable"
 msgstr ""
@@ -2832,47 +2832,47 @@ msgstr ""
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:98
+#: quantum/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:184
+#: quantum/openstack/common/lockutils.py:188
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:195
+#: quantum/openstack/common/lockutils.py:199
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:222
+#: quantum/openstack/common/lockutils.py:226
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:230
+#: quantum/openstack/common/lockutils.py:234
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/log.py:226
+#: quantum/openstack/common/log.py:244
 #, python-format
 msgid "Deprecated: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:329
+#: quantum/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:379
+#: quantum/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:537
+#: quantum/openstack/common/log.py:555
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2895,120 +2895,134 @@ msgstr ""
 msgid "in dynamic looping call"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:41
+#: quantum/openstack/common/periodic_task.py:42
 #, python-format
 msgid "Unexpected argument for periodic task creation: %(arg)s."
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:132
+#: quantum/openstack/common/periodic_task.py:133
 #, python-format
 msgid "Skipping periodic task %(task)s because its interval is negative"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:137
+#: quantum/openstack/common/periodic_task.py:138
 #, python-format
 msgid "Skipping periodic task %(task)s because it is disabled"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:175
+#: quantum/openstack/common/periodic_task.py:176
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:183
+#: quantum/openstack/common/periodic_task.py:184
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:394
+#: quantum/openstack/common/policy.py:395
 #, python-format
 msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:404
+#: quantum/openstack/common/policy.py:405
 #, python-format
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:679
+#: quantum/openstack/common/policy.py:680
 #, python-format
 msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:122
+#: quantum/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:137
+#: quantum/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:162
+#: quantum/openstack/common/processutils.py:167
+#: quantum/openstack/common/processutils.py:240
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:174
+#: quantum/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: quantum/openstack/common/service.py:112
-#: quantum/openstack/common/service.py:275
+#: quantum/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
+#: quantum/openstack/common/processutils.py:221
+msgid "Environment not supported over SSH"
+msgstr ""
+
+#: quantum/openstack/common/processutils.py:225
+msgid "process_input not supported over SSH"
+msgstr ""
+
+#: quantum/openstack/common/service.py:113
+#: quantum/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: quantum/openstack/common/service.py:121
-#: quantum/openstack/common/service.py:218
+#: quantum/openstack/common/service.py:122
+#: quantum/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:164
+#: quantum/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:200
+#: quantum/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: quantum/openstack/common/service.py:223
+#: quantum/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: quantum/openstack/common/service.py:230
+#: quantum/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:240
+#: quantum/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: quantum/openstack/common/service.py:257
+#: quantum/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:261
+#: quantum/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:265
+#: quantum/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
 
-#: quantum/openstack/common/service.py:293
+#: quantum/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: quantum/openstack/common/service.py:304
+#: quantum/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -3054,131 +3068,136 @@ msgstr ""
 
 #: quantum/openstack/common/rpc/amqp.py:200
 #, python-format
-msgid "no calling threads waiting for msg_id : %s, message : %s"
+msgid "no calling threads waiting for msg_id : %(msg_id)s, message : %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:208
+#: quantum/openstack/common/rpc/amqp.py:209
 #, python-format
 msgid ""
 "Number of call waiters is greater than warning threshhold: %d. There "
 "could be a MulticallProxyWaiter leak."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:291
+#: quantum/openstack/common/rpc/amqp.py:292
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:337
+#: quantum/openstack/common/rpc/amqp.py:338
 #, python-format
 msgid "UNIQUE_ID is %s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:406
+#: quantum/openstack/common/rpc/amqp.py:407
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:414
+#: quantum/openstack/common/rpc/amqp.py:415
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:415
+#: quantum/openstack/common/rpc/amqp.py:416
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:443
+#: quantum/openstack/common/rpc/amqp.py:444
 #: quantum/openstack/common/rpc/impl_zmq.py:286
 #, python-format
 msgid "Expected exception during message handling (%s)"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:451
+#: quantum/openstack/common/rpc/amqp.py:452
 #: quantum/openstack/common/rpc/impl_zmq.py:292
 msgid "Exception during message handling"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:586
+#: quantum/openstack/common/rpc/amqp.py:587
 #, python-format
 msgid "Making synchronous call on %s ..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:589
+#: quantum/openstack/common/rpc/amqp.py:590
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:623
+#: quantum/openstack/common/rpc/amqp.py:624
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:632
+#: quantum/openstack/common/rpc/amqp.py:633
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:660
+#: quantum/openstack/common/rpc/amqp.py:661
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:74
+#: quantum/openstack/common/rpc/common.py:75
 msgid "An unknown RPC related exception occurred."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:86
+#: quantum/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:104
+#: quantum/openstack/common/rpc/common.py:105
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:121
+#: quantum/openstack/common/rpc/common.py:122
 #, python-format
 msgid ""
 "Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:"
 " \"%(method)s\" info: \"%(info)s\""
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:137
 #: quantum/openstack/common/rpc/common.py:138
 #: quantum/openstack/common/rpc/common.py:139
+#: quantum/openstack/common/rpc/common.py:140
 msgid "<unknown>"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:143
+#: quantum/openstack/common/rpc/common.py:144
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:147
+#: quantum/openstack/common/rpc/common.py:148
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:151
+#: quantum/openstack/common/rpc/common.py:152
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:156
+#: quantum/openstack/common/rpc/common.py:157
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:280
+#: quantum/openstack/common/rpc/common.py:162
+#, python-format
+msgid "Specified RPC version cap, %(version_cap)s, is too low"
+msgstr ""
+
+#: quantum/openstack/common/rpc/common.py:285
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:302
+#: quantum/openstack/common/rpc/common.py:307
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
@@ -3441,25 +3460,30 @@ msgstr ""
 msgid "No match from matchmaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:53
+#: quantum/openstack/common/rpc/impl_zmq.py:852
+#, python-format
+msgid "rpc_zmq_matchmaker = %(orig)s is deprecated; use %(new)s instead"
+msgstr ""
+
+#: quantum/openstack/common/rpc/matchmaker.py:47
 msgid "Match not found by MatchMaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:89
+#: quantum/openstack/common/rpc/matchmaker.py:83
 msgid "Matchmaker does not implement registration or heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:239
+#: quantum/openstack/common/rpc/matchmaker.py:233
 #, python-format
-msgid "Matchmaker unregistered: %s, %s"
+msgid "Matchmaker unregistered: %(key)s, %(host)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:250
+#: quantum/openstack/common/rpc/matchmaker.py:245
 msgid "Register before starting heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:343
-#: quantum/openstack/common/rpc/matchmaker.py:361
+#: quantum/openstack/common/rpc/matchmaker_ring.py:81
+#: quantum/openstack/common/rpc/matchmaker_ring.py:99
 #, python-format
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
@@ -5124,7 +5148,7 @@ msgstr ""
 #: quantum/plugins/midonet/midonet_lib.py:278
 #, python-format
 msgid ""
-"RuleManager.create_for_sg_rule: adding accept rule %(rule_id) in "
+"RuleManager.create_for_sg_rule: adding accept rule %(rule_id)s in "
 "portgroup %(port_group_id)s"
 msgstr ""
 
@@ -5222,7 +5246,7 @@ msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
 #: quantum/plugins/midonet/plugin.py:319
-#: quantum/plugins/nicira/QuantumPlugin.py:1025
+#: quantum/plugins/nicira/QuantumPlugin.py:1030
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
@@ -6089,408 +6113,408 @@ msgstr ""
 msgid "The request has timed out."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:223
+#: quantum/plugins/nicira/QuantumPlugin.py:228
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:258
+#: quantum/plugins/nicira/QuantumPlugin.py:263
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:260
+#: quantum/plugins/nicira/QuantumPlugin.py:265
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:263
+#: quantum/plugins/nicira/QuantumPlugin.py:268
 #, python-format
 msgid ""
 "Unable to create logical router port for quantum port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:285
+#: quantum/plugins/nicira/QuantumPlugin.py:290
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:291
+#: quantum/plugins/nicira/QuantumPlugin.py:296
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
 "associated with Quantum %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:297
+#: quantum/plugins/nicira/QuantumPlugin.py:302
 #, python-format
 msgid ""
 "Unable to plug attachment in router port %(r_port_id)s for quantum port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:342
+#: quantum/plugins/nicira/QuantumPlugin.py:347
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:367
-#: quantum/plugins/nicira/QuantumPlugin.py:402
-#: quantum/plugins/nicira/QuantumPlugin.py:592
+#: quantum/plugins/nicira/QuantumPlugin.py:372
+#: quantum/plugins/nicira/QuantumPlugin.py:407
+#: quantum/plugins/nicira/QuantumPlugin.py:597
 #, python-format
 msgid ""
 "NVP plugin does not support regular VIF ports on external networks. Port "
 "%s will be down."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:387
-#: quantum/plugins/nicira/QuantumPlugin.py:468
-#: quantum/plugins/nicira/QuantumPlugin.py:612
+#: quantum/plugins/nicira/QuantumPlugin.py:392
+#: quantum/plugins/nicira/QuantumPlugin.py:473
+#: quantum/plugins/nicira/QuantumPlugin.py:617
 #, python-format
 msgid ""
 "_nvp_create_port completed for port %(name)s on network %(network_id)s. "
 "The new port id is %(id)s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:391
+#: quantum/plugins/nicira/QuantumPlugin.py:396
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:409
+#: quantum/plugins/nicira/QuantumPlugin.py:414
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:418
+#: quantum/plugins/nicira/QuantumPlugin.py:423
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:424
+#: quantum/plugins/nicira/QuantumPlugin.py:429
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:443
-#: quantum/plugins/nicira/QuantumPlugin.py:876
+#: quantum/plugins/nicira/QuantumPlugin.py:448
+#: quantum/plugins/nicira/QuantumPlugin.py:881
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:455
+#: quantum/plugins/nicira/QuantumPlugin.py:460
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:473
+#: quantum/plugins/nicira/QuantumPlugin.py:478
 msgid "An exception occured while plugging the interface"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:481
+#: quantum/plugins/nicira/QuantumPlugin.py:486
 #, python-format
 msgid ""
 "device_id field must be populated in order to create an external gateway "
 "port for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:489
+#: quantum/plugins/nicira/QuantumPlugin.py:494
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:535
+#: quantum/plugins/nicira/QuantumPlugin.py:540
 #, python-format
 msgid ""
 "_nvp_create_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s. NVP port id is %(nvp_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:573
+#: quantum/plugins/nicira/QuantumPlugin.py:578
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:577
-#: quantum/plugins/nicira/QuantumPlugin.py:1718
+#: quantum/plugins/nicira/QuantumPlugin.py:582
+#: quantum/plugins/nicira/QuantumPlugin.py:1723
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:579
+#: quantum/plugins/nicira/QuantumPlugin.py:584
 #, python-format
 msgid ""
 "_nvp_delete_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:617
+#: quantum/plugins/nicira/QuantumPlugin.py:622
 #, python-format
 msgid "An exception occured while plugging the gateway interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:657
+#: quantum/plugins/nicira/QuantumPlugin.py:662
 #, python-format
 msgid "Unable to find NVP uuid for Quantum port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:686
+#: quantum/plugins/nicira/QuantumPlugin.py:691
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:690
+#: quantum/plugins/nicira/QuantumPlugin.py:695
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:694
+#: quantum/plugins/nicira/QuantumPlugin.py:699
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:698
-#: quantum/plugins/nicira/QuantumPlugin.py:713
+#: quantum/plugins/nicira/QuantumPlugin.py:703
+#: quantum/plugins/nicira/QuantumPlugin.py:718
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:719
+#: quantum/plugins/nicira/QuantumPlugin.py:724
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:750
+#: quantum/plugins/nicira/QuantumPlugin.py:755
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:772
+#: quantum/plugins/nicira/QuantumPlugin.py:777
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:799
+#: quantum/plugins/nicira/QuantumPlugin.py:804
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not yet supported by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:858
+#: quantum/plugins/nicira/QuantumPlugin.py:863
 #, python-format
 msgid "A nvp lport identifier was not found for quantum port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:886
+#: quantum/plugins/nicira/QuantumPlugin.py:891
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:889
+#: quantum/plugins/nicira/QuantumPlugin.py:894
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:915
+#: quantum/plugins/nicira/QuantumPlugin.py:920
 #, python-format
 msgid ""
 "Current network status:%(nvp_net_status)s; Status in Quantum "
 "DB:%(quantum_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:925
-#: quantum/plugins/nicira/QuantumPlugin.py:975
+#: quantum/plugins/nicira/QuantumPlugin.py:930
+#: quantum/plugins/nicira/QuantumPlugin.py:980
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:989
+#: quantum/plugins/nicira/QuantumPlugin.py:994
 #, python-format
 msgid "Logical Switch %s found in quantum database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1004
+#: quantum/plugins/nicira/QuantumPlugin.py:1009
 #, python-format
 msgid ""
 "Found %s logical switches not bound to Quantum networks. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1008
+#: quantum/plugins/nicira/QuantumPlugin.py:1013
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1091
+#: quantum/plugins/nicira/QuantumPlugin.py:1096
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1100
+#: quantum/plugins/nicira/QuantumPlugin.py:1105
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1127
+#: quantum/plugins/nicira/QuantumPlugin.py:1132
 #, python-format
 msgid "Quantum logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1134
+#: quantum/plugins/nicira/QuantumPlugin.py:1139
 #, python-format
 msgid ""
 "Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1196
+#: quantum/plugins/nicira/QuantumPlugin.py:1201
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1202
+#: quantum/plugins/nicira/QuantumPlugin.py:1207
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1207
+#: quantum/plugins/nicira/QuantumPlugin.py:1212
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1271
+#: quantum/plugins/nicira/QuantumPlugin.py:1276
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1296
+#: quantum/plugins/nicira/QuantumPlugin.py:1301
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1410
-#: quantum/plugins/nicira/QuantumPlugin.py:1455
+#: quantum/plugins/nicira/QuantumPlugin.py:1415
+#: quantum/plugins/nicira/QuantumPlugin.py:1460
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1423
+#: quantum/plugins/nicira/QuantumPlugin.py:1428
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1465
+#: quantum/plugins/nicira/QuantumPlugin.py:1470
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1468
+#: quantum/plugins/nicira/QuantumPlugin.py:1473
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1488
+#: quantum/plugins/nicira/QuantumPlugin.py:1493
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1492
+#: quantum/plugins/nicira/QuantumPlugin.py:1497
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1513
+#: quantum/plugins/nicira/QuantumPlugin.py:1518
 #, python-format
 msgid ""
 "Current router status:%(router_status)s;Status in Quantum "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1521
+#: quantum/plugins/nicira/QuantumPlugin.py:1526
 msgid "Unable to get logical router"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1544
+#: quantum/plugins/nicira/QuantumPlugin.py:1549
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1566
+#: quantum/plugins/nicira/QuantumPlugin.py:1571
 #, python-format
 msgid ""
 "Found %s logical routers not bound to Quantum routers. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1593
+#: quantum/plugins/nicira/QuantumPlugin.py:1598
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1628
+#: quantum/plugins/nicira/QuantumPlugin.py:1633
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1673
+#: quantum/plugins/nicira/QuantumPlugin.py:1678
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1685
+#: quantum/plugins/nicira/QuantumPlugin.py:1690
 #, python-format
 msgid ""
 "Unable to find NVP logical router port for Quantum port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1714
+#: quantum/plugins/nicira/QuantumPlugin.py:1719
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1740
+#: quantum/plugins/nicira/QuantumPlugin.py:1745
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1746
+#: quantum/plugins/nicira/QuantumPlugin.py:1751
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1812
+#: quantum/plugins/nicira/QuantumPlugin.py:1817
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1836
+#: quantum/plugins/nicira/QuantumPlugin.py:1841
 #, python-format
 msgid ""
 "An error occurred while creating NAT rules on the NVP platform for "
 "floating ip:%(floating_ip)s mapped to internal ip:%(internal_ip)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1878
+#: quantum/plugins/nicira/QuantumPlugin.py:1883
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1881
+#: quantum/plugins/nicira/QuantumPlugin.py:1886
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1907
+#: quantum/plugins/nicira/QuantumPlugin.py:1912
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1929
+#: quantum/plugins/nicira/QuantumPlugin.py:1934
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
@@ -6536,69 +6560,69 @@ msgstr ""
 msgid "The network gateway %(gateway_id)s cannot be updated or deleted"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:152
+#: quantum/plugins/nicira/nicira_networkgw_db.py:160
 msgid ""
 "A network identifier must be specified when connecting a network to a "
 "network gateway. Unable to complete operation"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:158
+#: quantum/plugins/nicira/nicira_networkgw_db.py:166
 #, python-format
 msgid ""
 "Invalid keys found among the ones provided in request body: "
 "%(connection_attrs)s."
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:164
+#: quantum/plugins/nicira/nicira_networkgw_db.py:172
 msgid ""
 "In order to specify a segmentation id the segmentation type must be "
 "specified as well"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:168
+#: quantum/plugins/nicira/nicira_networkgw_db.py:176
 msgid "Cannot specify a segmentation id when the segmentation type is flat"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:217
+#: quantum/plugins/nicira/nicira_networkgw_db.py:225
 #, python-format
 msgid "Created network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:230
+#: quantum/plugins/nicira/nicira_networkgw_db.py:237
 #, python-format
 msgid "Updated network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:245
+#: quantum/plugins/nicira/nicira_networkgw_db.py:252
 #, python-format
 msgid "Network gateway '%s' was destroyed."
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:255
+#: quantum/plugins/nicira/nicira_networkgw_db.py:262
 #, python-format
 msgid "Connecting network '%(network_id)s' to gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:296
+#: quantum/plugins/nicira/nicira_networkgw_db.py:303
 #, python-format
 msgid ""
 "Requested network '%(network_id)s' not found.Unable to create network "
 "connection on gateway '%(network_gateway_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:304
+#: quantum/plugins/nicira/nicira_networkgw_db.py:311
 #, python-format
 msgid ""
 "Gateway port for '%(network_gateway_id)s' created on network "
 "'%(network_id)s':%(port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:320
+#: quantum/plugins/nicira/nicira_networkgw_db.py:327
 #, python-format
 msgid "Ensured no Ip addresses are configured on port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:330
+#: quantum/plugins/nicira/nicira_networkgw_db.py:337
 #, python-format
 msgid ""
 "Disconnecting network '%(network_id)s' from gateway "
@@ -7229,11 +7253,11 @@ msgid ""
 "router:'%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:63
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:66
 msgid "Cannot create a gateway with an empty device list"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:89
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:92
 msgid "number of network gateways allowed per tenant, -1 for unlimited"
 msgstr ""
 
@@ -7970,3 +7994,14 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
+#~ msgid "no calling threads waiting for msg_id : %s, message : %s"
+#~ msgstr ""
+
+#~ msgid "Matchmaker unregistered: %s, %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "RuleManager.create_for_sg_rule: adding accept rule"
+#~ " %(rule_id) in portgroup %(port_group_id)s"
+#~ msgstr ""
+

diff --git a/quantum/locale/de/LC_MESSAGES/quantum.po b/quantum/locale/de/LC_MESSAGES/quantum.po
index 117c0ee5d313184e2eef0e4af3801e928240bf0b..6fc67d5dd056daed3de48968c58aac8e9a7701aa 100644 (file)
--- a/quantum/locale/de/LC_MESSAGES/quantum.po
+++ b/quantum/locale/de/LC_MESSAGES/quantum.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-05-26 12:11+0000\n"
+"POT-Creation-Date: 2013-05-27 12:11+0000\n"
 "PO-Revision-Date: 2013-05-22 08:17+0000\n"
 "Last-Translator: daisy.ycguo <daisy.ycguo@gmail.com>\n"
 "Language-Team: German "
@@ -2408,7 +2408,7 @@ msgstr ""
 "bestimmten IP-Adresse bei Zuweisung einer dynamischen IP-Adresse "
 "erforderlich"
 
-#: quantum/db/l3_db.py:594 quantum/plugins/nicira/QuantumPlugin.py:1773
+#: quantum/db/l3_db.py:594 quantum/plugins/nicira/QuantumPlugin.py:1778
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr "'fixed_ip_address' kann nicht ohne 'port_id' angegeben werden"
 
@@ -3056,7 +3056,7 @@ msgid "Was expecting a dict for service definition, found the following: %s"
 msgstr "Verzeichnis für Servicedefinition erwartet, Folgendes gefunden: %s"
 
 #: quantum/extensions/servicetype.py:160
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:83
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:86
 #, python-format
 msgid "%s: provided data are not iterable"
 msgstr "%s: angegebene Daten sind nicht wiederholbar"
@@ -3082,51 +3082,51 @@ msgstr "Nicht abgefangene Ausnahme"
 msgid "Original exception being dropped: %s"
 msgstr "Ursprüngliche Ausnahme wird gelöscht: %s"
 
-#: quantum/openstack/common/lockutils.py:98
+#: quantum/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr "Angeforderte Sperre '%s' konnte nicht freigegeben werden"
 
-#: quantum/openstack/common/lockutils.py:184
+#: quantum/openstack/common/lockutils.py:188
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr "Semaphor \"%(lock)s\" für Methode \"%(method)s\" erhalten..."
 
-#: quantum/openstack/common/lockutils.py:195
+#: quantum/openstack/common/lockutils.py:199
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr "Versuch, Dateisperre \"%(lock)s\" für Methode \"%(method)s\" zu greifen..."
 
-#: quantum/openstack/common/lockutils.py:222
+#: quantum/openstack/common/lockutils.py:226
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 "Dateisperre \"%(lock)s\" unter %(path)s für Methode \"%(method)s\" "
 "erhalten..."
 
-#: quantum/openstack/common/lockutils.py:230
+#: quantum/openstack/common/lockutils.py:234
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 "Dateisperre \"%(lock)s\" unter %(path)s für Methode \"%(method)s\" "
 "freigegeben..."
 
-#: quantum/openstack/common/log.py:226
+#: quantum/openstack/common/log.py:244
 #, python-format
 msgid "Deprecated: %s"
 msgstr "Veraltet: %s"
 
-#: quantum/openstack/common/log.py:329
+#: quantum/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:379
+#: quantum/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr "syslog-Funktion muss einer der folgenden Werte sein: %s"
 
-#: quantum/openstack/common/log.py:537
+#: quantum/openstack/common/log.py:555
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr "Schwerwiegender Aufruf an veraltete Konfiguration: %(msg)s"
@@ -3149,120 +3149,134 @@ msgstr ""
 msgid "in dynamic looping call"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:41
+#: quantum/openstack/common/periodic_task.py:42
 #, python-format
 msgid "Unexpected argument for periodic task creation: %(arg)s."
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:132
+#: quantum/openstack/common/periodic_task.py:133
 #, python-format
 msgid "Skipping periodic task %(task)s because its interval is negative"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:137
+#: quantum/openstack/common/periodic_task.py:138
 #, python-format
 msgid "Skipping periodic task %(task)s because it is disabled"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:175
+#: quantum/openstack/common/periodic_task.py:176
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr "Regelmäßige Task %(full_task_name)s wird ausgeführt"
 
-#: quantum/openstack/common/periodic_task.py:183
+#: quantum/openstack/common/periodic_task.py:184
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr "Fehler bei %(full_task_name)s: %(e)s"
 
-#: quantum/openstack/common/policy.py:394
+#: quantum/openstack/common/policy.py:395
 #, python-format
 msgid "Failed to understand rule %(rule)s"
 msgstr "Regel %(rule)s konnte nicht verstanden werden"
 
-#: quantum/openstack/common/policy.py:404
+#: quantum/openstack/common/policy.py:405
 #, python-format
 msgid "No handler for matches of kind %s"
 msgstr "Kein Handler für Übereinstimmungen des Typs %s"
 
-#: quantum/openstack/common/policy.py:679
+#: quantum/openstack/common/policy.py:680
 #, python-format
 msgid "Failed to understand rule %(rule)r"
 msgstr "Regel %(rule)r konnte nicht verstanden werden"
 
-#: quantum/openstack/common/processutils.py:122
+#: quantum/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr "Unbekannte Schlüsselwortargumente für 'utils.execute' erhalten: %r"
 
-#: quantum/openstack/common/processutils.py:137
+#: quantum/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "CMD wird ausgeführt (Unterprozess): %s"
 
-#: quantum/openstack/common/processutils.py:162
+#: quantum/openstack/common/processutils.py:167
+#: quantum/openstack/common/processutils.py:240
 #, python-format
 msgid "Result was %s"
 msgstr "Ergebnis war %s"
 
-#: quantum/openstack/common/processutils.py:174
+#: quantum/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr "%r fehlgeschlagen. Neuversuch."
 
-#: quantum/openstack/common/service.py:112
-#: quantum/openstack/common/service.py:275
+#: quantum/openstack/common/processutils.py:219
+#, fuzzy, python-format
+msgid "Running cmd (SSH): %s"
+msgstr "CMD wird ausgeführt (Unterprozess): %s"
+
+#: quantum/openstack/common/processutils.py:221
+msgid "Environment not supported over SSH"
+msgstr ""
+
+#: quantum/openstack/common/processutils.py:225
+msgid "process_input not supported over SSH"
+msgstr ""
+
+#: quantum/openstack/common/service.py:113
+#: quantum/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr "Vollständiger Satz von CONF:"
 
-#: quantum/openstack/common/service.py:121
-#: quantum/openstack/common/service.py:218
+#: quantum/openstack/common/service.py:122
+#: quantum/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr "%s abgefangen; Vorgang wird beendet"
 
-#: quantum/openstack/common/service.py:164
+#: quantum/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr "Übergeordneter Prozess wurde unerwartet abgebrochen; Vorgang wird beendet"
 
-#: quantum/openstack/common/service.py:200
+#: quantum/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr "Verzweigung zu schnell; im Ruhemodus"
 
-#: quantum/openstack/common/service.py:223
+#: quantum/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr "Nicht behandelte Ausnahme"
 
-#: quantum/openstack/common/service.py:230
+#: quantum/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr "Untergeordnetes Element %d gestartet"
 
-#: quantum/openstack/common/service.py:240
+#: quantum/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr "Starten von %d Workers"
 
-#: quantum/openstack/common/service.py:257
+#: quantum/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr "Untergeordnetes Element %(pid)d durch Signal %(sig)d abgebrochen"
 
-#: quantum/openstack/common/service.py:261
+#: quantum/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr "Untergeordnete %(pid)s mit Status %(code)d beendet"
 
-#: quantum/openstack/common/service.py:265
+#: quantum/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr "PID %d nicht in Liste untergeordneter Elemente vorhanden"
 
-#: quantum/openstack/common/service.py:293
+#: quantum/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr "%s abgefangen, untergeordnete Elemente werden gestoppt"
 
-#: quantum/openstack/common/service.py:304
+#: quantum/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr "Warten auf Beenden von %d untergeordneten Elementen"
@@ -3318,11 +3332,11 @@ msgid "Pool creating new connection"
 msgstr "Pool erstellt neue Verbindung"
 
 #: quantum/openstack/common/rpc/amqp.py:200
-#, python-format
-msgid "no calling threads waiting for msg_id : %s, message : %s"
+#, fuzzy, python-format
+msgid "no calling threads waiting for msg_id : %(msg_id)s, message : %(data)s"
 msgstr "Keine aufrufenden Threads ausstehend für 'msg_id' : %s, Nachricht : %s "
 
-#: quantum/openstack/common/rpc/amqp.py:208
+#: quantum/openstack/common/rpc/amqp.py:209
 #, python-format
 msgid ""
 "Number of call waiters is greater than warning threshhold: %d. There "
@@ -3332,75 +3346,75 @@ msgstr ""
 "Warnungsbegrenzung: %d. Möglicherweise gibt es ein Leck in "
 "'MulticallProxyWaiter'."
 
-#: quantum/openstack/common/rpc/amqp.py:291
+#: quantum/openstack/common/rpc/amqp.py:292
 #, python-format
 msgid "unpacked context: %s"
 msgstr "Entpackter Kontext: %s"
 
-#: quantum/openstack/common/rpc/amqp.py:337
+#: quantum/openstack/common/rpc/amqp.py:338
 #, python-format
 msgid "UNIQUE_ID is %s."
 msgstr "'UNIQUE_ID' ist %s."
 
-#: quantum/openstack/common/rpc/amqp.py:406
+#: quantum/openstack/common/rpc/amqp.py:407
 #, python-format
 msgid "received %s"
 msgstr "%s erhalten"
 
-#: quantum/openstack/common/rpc/amqp.py:414
+#: quantum/openstack/common/rpc/amqp.py:415
 #, python-format
 msgid "no method for message: %s"
 msgstr "Keine Methode für Nachricht: %s"
 
-#: quantum/openstack/common/rpc/amqp.py:415
+#: quantum/openstack/common/rpc/amqp.py:416
 #, python-format
 msgid "No method for message: %s"
 msgstr "Keine Methode für Nachricht: %s"
 
-#: quantum/openstack/common/rpc/amqp.py:443
+#: quantum/openstack/common/rpc/amqp.py:444
 #: quantum/openstack/common/rpc/impl_zmq.py:286
 #, python-format
 msgid "Expected exception during message handling (%s)"
 msgstr "Erwartete Ausnahme bei Nachrichtenbehandlung (%s)"
 
-#: quantum/openstack/common/rpc/amqp.py:451
+#: quantum/openstack/common/rpc/amqp.py:452
 #: quantum/openstack/common/rpc/impl_zmq.py:292
 msgid "Exception during message handling"
 msgstr "Ausnahme bei Nachrichtenbehandlung"
 
-#: quantum/openstack/common/rpc/amqp.py:586
+#: quantum/openstack/common/rpc/amqp.py:587
 #, python-format
 msgid "Making synchronous call on %s ..."
 msgstr "Synchroner Aufruf bei %s ..."
 
-#: quantum/openstack/common/rpc/amqp.py:589
+#: quantum/openstack/common/rpc/amqp.py:590
 #, python-format
 msgid "MSG_ID is %s"
 msgstr "'MSG_ID' ist %s"
 
-#: quantum/openstack/common/rpc/amqp.py:623
+#: quantum/openstack/common/rpc/amqp.py:624
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr "Asynchroner Cast bei %s..."
 
-#: quantum/openstack/common/rpc/amqp.py:632
+#: quantum/openstack/common/rpc/amqp.py:633
 msgid "Making asynchronous fanout cast..."
 msgstr "Asynchroner Fan-out-Cast..."
 
-#: quantum/openstack/common/rpc/amqp.py:660
+#: quantum/openstack/common/rpc/amqp.py:661
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr "%(event_type)s wird gesendet auf %(topic)s"
 
-#: quantum/openstack/common/rpc/common.py:74
+#: quantum/openstack/common/rpc/common.py:75
 msgid "An unknown RPC related exception occurred."
 msgstr "Eine unbekannte Ausnahme in Zusammenhang mit RPC ist aufgetreten."
 
-#: quantum/openstack/common/rpc/common.py:86
+#: quantum/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr "Ausnahme bei Zeichenfolgeformatoperation"
 
-#: quantum/openstack/common/rpc/common.py:104
+#: quantum/openstack/common/rpc/common.py:105
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
@@ -3409,36 +3423,36 @@ msgstr ""
 "Ferner Fehler: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 
-#: quantum/openstack/common/rpc/common.py:121
+#: quantum/openstack/common/rpc/common.py:122
 #, python-format
 msgid ""
 "Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:"
 " \"%(method)s\" info: \"%(info)s\""
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:137
 #: quantum/openstack/common/rpc/common.py:138
 #: quantum/openstack/common/rpc/common.py:139
+#: quantum/openstack/common/rpc/common.py:140
 msgid "<unknown>"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:143
+#: quantum/openstack/common/rpc/common.py:144
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr "Doppelte Nachricht (%(msg_id)s) gefunden. Wird übersprungen."
 
-#: quantum/openstack/common/rpc/common.py:147
+#: quantum/openstack/common/rpc/common.py:148
 msgid "Invalid reuse of an RPC connection."
 msgstr "Ungültige Wiederverwendung einer RPC-Verbindung."
 
-#: quantum/openstack/common/rpc/common.py:151
+#: quantum/openstack/common/rpc/common.py:152
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 "Angegebene RPC-Version %(version)s wird von diesem Endpunkt nicht "
 "unterstützt. "
 
-#: quantum/openstack/common/rpc/common.py:156
+#: quantum/openstack/common/rpc/common.py:157
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
@@ -3447,12 +3461,17 @@ msgstr ""
 "Angegebene RPC-Umschlagsversion %(version)s wird von diesem Endpunkt "
 "nicht unterstützt."
 
-#: quantum/openstack/common/rpc/common.py:280
+#: quantum/openstack/common/rpc/common.py:162
+#, python-format
+msgid "Specified RPC version cap, %(version_cap)s, is too low"
+msgstr ""
+
+#: quantum/openstack/common/rpc/common.py:285
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr "%(item)s konnte nicht bereinigt werden. Zentraler Fehler %(err)s"
 
-#: quantum/openstack/common/rpc/common.py:302
+#: quantum/openstack/common/rpc/common.py:307
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr "Ausnahme %s wird an Aufrufenden zurückgegeben"
@@ -3727,25 +3746,30 @@ msgstr "Keine MatchMaker-Ergebnisse. Kein Casting. "
 msgid "No match from matchmaker."
 msgstr "Keine Übereinstimmung von MatchMaker."
 
-#: quantum/openstack/common/rpc/matchmaker.py:53
+#: quantum/openstack/common/rpc/impl_zmq.py:852
+#, python-format
+msgid "rpc_zmq_matchmaker = %(orig)s is deprecated; use %(new)s instead"
+msgstr ""
+
+#: quantum/openstack/common/rpc/matchmaker.py:47
 msgid "Match not found by MatchMaker."
 msgstr "Keine Übereinstimmung von MatchMaker gefunden."
 
-#: quantum/openstack/common/rpc/matchmaker.py:89
+#: quantum/openstack/common/rpc/matchmaker.py:83
 msgid "Matchmaker does not implement registration or heartbeat."
 msgstr "MatchMaker implementiert keine Registrierung und kein Überwachungssignal."
 
-#: quantum/openstack/common/rpc/matchmaker.py:239
-#, python-format
-msgid "Matchmaker unregistered: %s, %s"
+#: quantum/openstack/common/rpc/matchmaker.py:233
+#, fuzzy, python-format
+msgid "Matchmaker unregistered: %(key)s, %(host)s"
 msgstr "MatchMaker nicht registriert: %s, %s"
 
-#: quantum/openstack/common/rpc/matchmaker.py:250
+#: quantum/openstack/common/rpc/matchmaker.py:245
 msgid "Register before starting heartbeat."
 msgstr "Registrierung vor Start des Überwachungssignals nötig."
 
-#: quantum/openstack/common/rpc/matchmaker.py:343
-#: quantum/openstack/common/rpc/matchmaker.py:361
+#: quantum/openstack/common/rpc/matchmaker_ring.py:81
+#: quantum/openstack/common/rpc/matchmaker_ring.py:99
 #, python-format
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr "Keine schlüsseldefinierenden Hosts für Topic '%s', siehe Ringdatei"
@@ -5492,9 +5516,9 @@ msgid "Don't know what to do with rule=%r"
 msgstr "Maßnahme für 'rule=%r' nicht bekannt"
 
 #: quantum/plugins/midonet/midonet_lib.py:278
-#, python-format
+#, fuzzy, python-format
 msgid ""
-"RuleManager.create_for_sg_rule: adding accept rule %(rule_id) in "
+"RuleManager.create_for_sg_rule: adding accept rule %(rule_id)s in "
 "portgroup %(port_group_id)s"
 msgstr ""
 "RuleManager.create_for_sg_rule: Bestätigungsregel %(rule_id) in "
@@ -5602,7 +5626,7 @@ msgstr ""
 "network=%(network)r"
 
 #: quantum/plugins/midonet/plugin.py:319
-#: quantum/plugins/nicira/QuantumPlugin.py:1025
+#: quantum/plugins/nicira/QuantumPlugin.py:1030
 msgid "admin_state_up=False networks are not supported."
 msgstr "Netze mit 'admin_state_up=False' werden nicht unterstützt."
 
@@ -6527,22 +6551,22 @@ msgstr "Der Anforderung wird der Zugang zur referenzierten Ressource verweigert.
 msgid "The request has timed out."
 msgstr "Die Anforderung hat das zulässige Zeitlimit überschritten."
 
-#: quantum/plugins/nicira/QuantumPlugin.py:223
+#: quantum/plugins/nicira/QuantumPlugin.py:228
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr "Der Standardservice des L2-Gateways kann nicht verarbeitet werden: %s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:258
+#: quantum/plugins/nicira/QuantumPlugin.py:263
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr "NVP-Routerport erstellt: %s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:260
+#: quantum/plugins/nicira/QuantumPlugin.py:265
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr "Erstellung von Port auf logischem NVP-Router %s nicht möglich"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:263
+#: quantum/plugins/nicira/QuantumPlugin.py:268
 #, python-format
 msgid ""
 "Unable to create logical router port for quantum port id %(port_id)s on "
@@ -6551,12 +6575,12 @@ msgstr ""
 "Erstellung eines Ports für den logischen Router für Quantum-Port-ID "
 "%(port_id)s auf Router %(router_id)s nicht möglich"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:285
+#: quantum/plugins/nicira/QuantumPlugin.py:290
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr "'%(att)s' dem NVP-Routerport %(port)s zugeordnet"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:291
+#: quantum/plugins/nicira/QuantumPlugin.py:296
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
@@ -6566,7 +6590,7 @@ msgstr ""
 "%(r_port_id)s, der Quantum %(q_port_id)s zugeordnet ist, ist nicht "
 "möglich"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:297
+#: quantum/plugins/nicira/QuantumPlugin.py:302
 #, python-format
 msgid ""
 "Unable to plug attachment in router port %(r_port_id)s for quantum port "
@@ -6575,13 +6599,13 @@ msgstr ""
 "Verbinden der Zusatzeinheit mit Routerport %(r_port_id)s für Quantum-"
 "Port-ID %(q_port_id)s auf Router %(router_id)s ist nicht möglich"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:342
+#: quantum/plugins/nicira/QuantumPlugin.py:347
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:367
-#: quantum/plugins/nicira/QuantumPlugin.py:402
-#: quantum/plugins/nicira/QuantumPlugin.py:592
+#: quantum/plugins/nicira/QuantumPlugin.py:372
+#: quantum/plugins/nicira/QuantumPlugin.py:407
+#: quantum/plugins/nicira/QuantumPlugin.py:597
 #, python-format
 msgid ""
 "NVP plugin does not support regular VIF ports on external networks. Port "
@@ -6590,9 +6614,9 @@ msgstr ""
 "Das NVP-Plug-in unterstützt keine VIF-Standardports in externen Netzen. "
 "Port %s wird inaktiv sein."
 
-#: quantum/plugins/nicira/QuantumPlugin.py:387
-#: quantum/plugins/nicira/QuantumPlugin.py:468
-#: quantum/plugins/nicira/QuantumPlugin.py:612
+#: quantum/plugins/nicira/QuantumPlugin.py:392
+#: quantum/plugins/nicira/QuantumPlugin.py:473
+#: quantum/plugins/nicira/QuantumPlugin.py:617
 #, python-format
 msgid ""
 "_nvp_create_port completed for port %(name)s on network %(network_id)s. "
@@ -6601,28 +6625,28 @@ msgstr ""
 "'_nvp_create_port' für Port %(name)s in Netz %(network_id)s "
 "abgeschlossen. Die neue Port-ID lautet %(id)s."
 
-#: quantum/plugins/nicira/QuantumPlugin.py:391
+#: quantum/plugins/nicira/QuantumPlugin.py:396
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr "Ausnahme bei Verbindung der Schnittstelle mit Netz %s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:409
+#: quantum/plugins/nicira/QuantumPlugin.py:414
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr "Port '%s' wurde von der NVP-Plattform bereits gelöscht"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:418
+#: quantum/plugins/nicira/QuantumPlugin.py:423
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr "'_nvp_delete_port' für Port %(port_id)s in Netz %(net_id)s abgeschlossen"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:424
+#: quantum/plugins/nicira/QuantumPlugin.py:429
 #, python-format
 msgid "port %s not found in NVP"
 msgstr "Port %s in NVP nicht gefunden"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:443
-#: quantum/plugins/nicira/QuantumPlugin.py:876
+#: quantum/plugins/nicira/QuantumPlugin.py:448
+#: quantum/plugins/nicira/QuantumPlugin.py:881
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
@@ -6631,7 +6655,7 @@ msgstr ""
 "Ausnahme wird ignoriert, da dies bedeutet, dass der Peer für Port '%s' "
 "bereits gelöscht wurde."
 
-#: quantum/plugins/nicira/QuantumPlugin.py:455
+#: quantum/plugins/nicira/QuantumPlugin.py:460
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
@@ -6640,11 +6664,11 @@ msgstr ""
 "Die Erstellung von Routerschnittstellenports in externen Netzen wie %s "
 "ist nicht zulässig"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:473
+#: quantum/plugins/nicira/QuantumPlugin.py:478
 msgid "An exception occured while plugging the interface"
 msgstr "Beim Verbinden der Schnittstelle ist ein Fehler aufgetreten"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:481
+#: quantum/plugins/nicira/QuantumPlugin.py:486
 #, python-format
 msgid ""
 "device_id field must be populated in order to create an external gateway "
@@ -6653,12 +6677,12 @@ msgstr ""
 "Das Feld 'device_id' muss ausgefüllt sein, damit ein externer Gateway-"
 "Port für Netz %s erstellt werden kann"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:489
+#: quantum/plugins/nicira/QuantumPlugin.py:494
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr "Der Gateway-Port für Router %s wurde auf der Back-End-NVP nicht gefunden"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:535
+#: quantum/plugins/nicira/QuantumPlugin.py:540
 #, python-format
 msgid ""
 "_nvp_create_ext_gw_port completed on external network %(ext_net_id)s, "
@@ -6667,19 +6691,19 @@ msgstr ""
 "'_nvp_create_ext_gw_port' im externen Netz %(ext_net_id)s, angehängt an "
 "Router: %(router_id)s, abgeschlossen. NVP-Port-ID ist %(nvp_port_id)s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:573
+#: quantum/plugins/nicira/QuantumPlugin.py:578
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 "Die Ressource %s des logischen Routers auf der NVP-Plattform nicht "
 "gefunden"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:577
-#: quantum/plugins/nicira/QuantumPlugin.py:1718
+#: quantum/plugins/nicira/QuantumPlugin.py:582
+#: quantum/plugins/nicira/QuantumPlugin.py:1723
 msgid "Unable to update logical routeron NVP Platform"
 msgstr "Logischer Router kann auf der NVP-Plattform nicht aktualisiert werden"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:579
+#: quantum/plugins/nicira/QuantumPlugin.py:584
 #, python-format
 msgid ""
 "_nvp_delete_ext_gw_port completed on external network %(ext_net_id)s, "
@@ -6688,51 +6712,51 @@ msgstr ""
 "'_nvp_delete_ext_gw_port' im externen Netz %(ext_net_id)s, angehängt an "
 "Router: %(router_id)s, abgeschlossen"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:617
+#: quantum/plugins/nicira/QuantumPlugin.py:622
 #, python-format
 msgid "An exception occured while plugging the gateway interface into network:%s"
 msgstr "Ausnahme bei Verbindung der Gateway-Schnittstelle mit Netz: %s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:657
+#: quantum/plugins/nicira/QuantumPlugin.py:662
 #, python-format
 msgid "Unable to find NVP uuid for Quantum port %s"
 msgstr "NVP-UUID für Quantum-Port %s kann nicht gefunden werden"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:686
+#: quantum/plugins/nicira/QuantumPlugin.py:691
 #, python-format
 msgid "%s required"
 msgstr "%s erforderlich"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:690
+#: quantum/plugins/nicira/QuantumPlugin.py:695
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr "Segmentations-ID kann bei einfachem Netztyp nicht angegeben werden"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:694
+#: quantum/plugins/nicira/QuantumPlugin.py:699
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr "Segmentations-ID muss bei VLAN-Netztyp angegeben werden"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:698
-#: quantum/plugins/nicira/QuantumPlugin.py:713
+#: quantum/plugins/nicira/QuantumPlugin.py:703
+#: quantum/plugins/nicira/QuantumPlugin.py:718
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:719
+#: quantum/plugins/nicira/QuantumPlugin.py:724
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr "%(net_type_param)s %(net_type_value)s nicht unterstützt"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:750
+#: quantum/plugins/nicira/QuantumPlugin.py:755
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr "Kein Switch hat verfügbare Ports (%d geprüft)"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:772
+#: quantum/plugins/nicira/QuantumPlugin.py:777
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr "Maximale Anzahl an logischen Ports für logisches Netz %s erreicht"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:799
+#: quantum/plugins/nicira/QuantumPlugin.py:804
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not yet supported by this plugin. "
@@ -6741,22 +6765,22 @@ msgstr ""
 "Netze, für die 'admin_state_up=False' gilt, werden von diesem Plug-in "
 "noch nicht unterstützt. Einstellungen für Netz %s werden ignoriert"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:858
+#: quantum/plugins/nicira/QuantumPlugin.py:863
 #, python-format
 msgid "A nvp lport identifier was not found for quantum port '%s'"
 msgstr "Es wurde keine ID für den NVP-Loop-Port für Quantum-Port '%s' gefunden"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:886
+#: quantum/plugins/nicira/QuantumPlugin.py:891
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr "'delete_network' für Nutzer abgeschlossen: %s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:889
+#: quantum/plugins/nicira/QuantumPlugin.py:894
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr "Es wurde kein lSwitch %s in NVP gefunden"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:915
+#: quantum/plugins/nicira/QuantumPlugin.py:920
 #, python-format
 msgid ""
 "Current network status:%(nvp_net_status)s; Status in Quantum "
@@ -6765,19 +6789,19 @@ msgstr ""
 "Aktueller Netzstatus: %(nvp_net_status)s; Status in der Quantum-"
 "Datenbank: %(quantum_status)s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:925
-#: quantum/plugins/nicira/QuantumPlugin.py:975
+#: quantum/plugins/nicira/QuantumPlugin.py:930
+#: quantum/plugins/nicira/QuantumPlugin.py:980
 msgid "Unable to get logical switches"
 msgstr "Abrufen logischer Switches nicht möglich"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:989
+#: quantum/plugins/nicira/QuantumPlugin.py:994
 #, python-format
 msgid "Logical Switch %s found in quantum database but not in NVP."
 msgstr ""
 "Logischer Switch %s wurde in Quantum-Datenbank gefunden, aber nicht in "
 "NVP. "
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1004
+#: quantum/plugins/nicira/QuantumPlugin.py:1009
 #, python-format
 msgid ""
 "Found %s logical switches not bound to Quantum networks. Quantum and NVP "
@@ -6786,26 +6810,26 @@ msgstr ""
 "%s logische Switches gefunden, die nicht an Quantum-Netze gebunden sind. "
 "Quantum und NVP sind möglicherweise nicht synchron"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1008
+#: quantum/plugins/nicira/QuantumPlugin.py:1013
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr "'get_networks()' für Nutzer %s abgeschlossen"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1091
+#: quantum/plugins/nicira/QuantumPlugin.py:1096
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr "LSwitch %s in NVP nicht gefunden"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1100
+#: quantum/plugins/nicira/QuantumPlugin.py:1105
 msgid "Unable to get ports"
 msgstr "Abrufen von Ports nicht möglich"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1127
+#: quantum/plugins/nicira/QuantumPlugin.py:1132
 #, python-format
 msgid "Quantum logical port %s was not found on NVP"
 msgstr "Logischer Quantum-Port %s wurde auf NVP nicht gefunden"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1134
+#: quantum/plugins/nicira/QuantumPlugin.py:1139
 #, python-format
 msgid ""
 "Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
@@ -6814,61 +6838,61 @@ msgstr ""
 "%s logische Ports gefunden, die nicht an Quantum-Ports gebunden sind. "
 "Quantum und NVP sind möglicherweise nicht synchron"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1196
+#: quantum/plugins/nicira/QuantumPlugin.py:1201
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1202
+#: quantum/plugins/nicira/QuantumPlugin.py:1207
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 "Erstellung eines Ports oder Einrichtung einer Zusatzeinheit des Ports in "
 "NVP nicht möglich."
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1207
+#: quantum/plugins/nicira/QuantumPlugin.py:1212
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr "'create_port' auf NVP für Nutzer %(tenant_id)s fertig gestellt: (%(id)s)"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1271
+#: quantum/plugins/nicira/QuantumPlugin.py:1276
 #, python-format
 msgid "Update port request: %s"
 msgstr "Portanforderung aktualisieren: %s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1296
+#: quantum/plugins/nicira/QuantumPlugin.py:1301
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1410
-#: quantum/plugins/nicira/QuantumPlugin.py:1455
+#: quantum/plugins/nicira/QuantumPlugin.py:1415
+#: quantum/plugins/nicira/QuantumPlugin.py:1460
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr "Netz '%s' ist kein gültiges externes Netz"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1423
+#: quantum/plugins/nicira/QuantumPlugin.py:1428
 msgid "Unable to create logical router on NVP Platform"
 msgstr "Logischer Router kann auf der NVP-Plattform nicht erstellt werden"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1465
+#: quantum/plugins/nicira/QuantumPlugin.py:1470
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr "Logischer Router %s auf der NVP-Plattform nicht gefunden"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1468
+#: quantum/plugins/nicira/QuantumPlugin.py:1473
 msgid "Unable to update logical router on NVP Platform"
 msgstr "Logischer Router kann auf der NVP-Plattform nicht aktualisiert werden"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1488
+#: quantum/plugins/nicira/QuantumPlugin.py:1493
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr "Logischer Router '%s' auf der NVP-Plattform nicht gefunden"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1492
+#: quantum/plugins/nicira/QuantumPlugin.py:1497
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr "Logischer Router kann auf der NVP-Plattform nicht gelöscht werden"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1513
+#: quantum/plugins/nicira/QuantumPlugin.py:1518
 #, python-format
 msgid ""
 "Current router status:%(router_status)s;Status in Quantum "
@@ -6877,15 +6901,15 @@ msgstr ""
 "Aktueller Routerstatus: %(router_status)s; Status in der Quantum-"
 "Datenbank: %(db_router_status)s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1521
+#: quantum/plugins/nicira/QuantumPlugin.py:1526
 msgid "Unable to get logical router"
 msgstr "Abrufen des logischen Routers nicht möglich"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1544
+#: quantum/plugins/nicira/QuantumPlugin.py:1549
 msgid "Unable to get logical routers from NVP controller"
 msgstr "Abrufen des logischen Routers vom NVP-Controller nicht möglich"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1566
+#: quantum/plugins/nicira/QuantumPlugin.py:1571
 #, python-format
 msgid ""
 "Found %s logical routers not bound to Quantum routers. Quantum and NVP "
@@ -6894,7 +6918,7 @@ msgstr ""
 "%s logische Router gefunden, die nicht an Quantum-Router gebunden sind. "
 "Quantum und NVP sind möglicherweise nicht synchron"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1593
+#: quantum/plugins/nicira/QuantumPlugin.py:1598
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
@@ -6903,7 +6927,7 @@ msgstr ""
 "Port %(port_id)s, verbunden mit Router %(router_id)s, wurde auf der Back-"
 "End-NVP nicht gefunden."
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1628
+#: quantum/plugins/nicira/QuantumPlugin.py:1633
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
@@ -6912,7 +6936,7 @@ msgstr ""
 "'Add_router_interface' für Teilnetz: %(subnet_id)s und Router: "
 "%(router_id)s abgeschlossen"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1673
+#: quantum/plugins/nicira/QuantumPlugin.py:1678
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
@@ -6921,7 +6945,7 @@ msgstr ""
 "Port %(port_id)s, verbunden mit Router %(router_id)s, wurde auf der Back-"
 "End-NVP nicht gefunden"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1685
+#: quantum/plugins/nicira/QuantumPlugin.py:1690
 #, python-format
 msgid ""
 "Unable to find NVP logical router port for Quantum port id:%s. Was this "
@@ -6931,14 +6955,14 @@ msgstr ""
 "gefunden werden: %s. War dieser Ports jemals paarweise mit einem "
 "logischen Router verbunden?"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1714
+#: quantum/plugins/nicira/QuantumPlugin.py:1719
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 "Port-Ressource %s des logischen Routers auf der NVP-Plattform nicht "
 "gefunden"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1740
+#: quantum/plugins/nicira/QuantumPlugin.py:1745
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
@@ -6947,18 +6971,18 @@ msgstr ""
 "Fehler beim Entfernen von NAT-Regeln auf der NVP-Plattform für dynamische"
 " IP-Adresse: %s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1746
+#: quantum/plugins/nicira/QuantumPlugin.py:1751
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 "Eine falsche Anzahl an übereinstimmenden NAT-Regeln wurde auf der NVP-"
 "Plattform gefunden"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1812
+#: quantum/plugins/nicira/QuantumPlugin.py:1817
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr "Adressliste für Port des logischen Routers von NVP: %s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1836
+#: quantum/plugins/nicira/QuantumPlugin.py:1841
 #, python-format
 msgid ""
 "An error occurred while creating NAT rules on the NVP platform for "
@@ -6968,17 +6992,17 @@ msgstr ""
 " IP-Adresse: %(floating_ip)s, zugeordnet zu interner IP-Adresse: "
 "%(internal_ip)s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1878
+#: quantum/plugins/nicira/QuantumPlugin.py:1883
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr "Port '%s' ist keinen dynamischen IP-Adressen zugeordnet"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1881
+#: quantum/plugins/nicira/QuantumPlugin.py:1886
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1907
+#: quantum/plugins/nicira/QuantumPlugin.py:1912
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
@@ -6987,7 +7011,7 @@ msgstr ""
 "'Create_l2_gw_service' hat keine UUID für die neu erstellte Ressource "
 "zurückgegeben: %s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1929
+#: quantum/plugins/nicira/QuantumPlugin.py:1934
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
@@ -7047,7 +7071,7 @@ msgstr ""
 "Das Netzgateway %(gateway_id)s kann nicht aktualisiert oder gelöscht "
 "werden"
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:152
+#: quantum/plugins/nicira/nicira_networkgw_db.py:160
 msgid ""
 "A network identifier must be specified when connecting a network to a "
 "network gateway. Unable to complete operation"
@@ -7055,7 +7079,7 @@ msgstr ""
 "Eine Netz-ID muss bei Verbindung eines Netzes mit einem Netzgateway "
 "angegeben werden. Operation kann nicht abgeschlossen werden"
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:158
+#: quantum/plugins/nicira/nicira_networkgw_db.py:166
 #, python-format
 msgid ""
 "Invalid keys found among the ones provided in request body: "
@@ -7064,7 +7088,7 @@ msgstr ""
 "Ungültige Schlüssel unter den im Anforderungshauptteil angegebenen "
 "gefunden: %(connection_attrs)s."
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:164
+#: quantum/plugins/nicira/nicira_networkgw_db.py:172
 msgid ""
 "In order to specify a segmentation id the segmentation type must be "
 "specified as well"
@@ -7072,33 +7096,33 @@ msgstr ""
 "Damit eine Segmentierungs-ID angegeben werden kann, muss auch der "
 "Segmentierungstyp angegeben werden"
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:168
+#: quantum/plugins/nicira/nicira_networkgw_db.py:176
 msgid "Cannot specify a segmentation id when the segmentation type is flat"
 msgstr ""
 "Segmentierungs-ID kann nicht angegeben werden, wenn der Segmentierungstyp"
 " 'flat' ist"
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:217
+#: quantum/plugins/nicira/nicira_networkgw_db.py:225
 #, python-format
 msgid "Created network gateway with id:%s"
 msgstr "Netzgateway mit ID erstellt: %s"
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:230
+#: quantum/plugins/nicira/nicira_networkgw_db.py:237
 #, python-format
 msgid "Updated network gateway with id:%s"
 msgstr "Netzgateway mit ID aktualisiert: %s"
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:245
+#: quantum/plugins/nicira/nicira_networkgw_db.py:252
 #, python-format
 msgid "Network gateway '%s' was destroyed."
 msgstr "Netzgateway '%s' gelöscht."
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:255
+#: quantum/plugins/nicira/nicira_networkgw_db.py:262
 #, python-format
 msgid "Connecting network '%(network_id)s' to gateway '%(network_gateway_id)s'"
 msgstr "Netz '%(network_id)s' wird mit Gateway '%(network_gateway_id)s' verbunden"
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:296
+#: quantum/plugins/nicira/nicira_networkgw_db.py:303
 #, python-format
 msgid ""
 "Requested network '%(network_id)s' not found.Unable to create network "
@@ -7107,7 +7131,7 @@ msgstr ""
 "Angefordertes Netz '%(network_id)s' nicht gefunden. Netzverbindung auf "
 "Gateway '%(network_gateway_id)s' kann nicht erstellt werden"
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:304
+#: quantum/plugins/nicira/nicira_networkgw_db.py:311
 #, python-format
 msgid ""
 "Gateway port for '%(network_gateway_id)s' created on network "
@@ -7116,12 +7140,12 @@ msgstr ""
 "Gateway-Port für '%(network_gateway_id)s' in Netz '%(network_id)s' "
 "erstellt: %(port_id)s"
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:320
+#: quantum/plugins/nicira/nicira_networkgw_db.py:327
 #, python-format
 msgid "Ensured no Ip addresses are configured on port %s"
 msgstr "Sichergestellt, dass auf Port %s keine IP-Adressen konfiguriert sind"
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:330
+#: quantum/plugins/nicira/nicira_networkgw_db.py:337
 #, python-format
 msgid ""
 "Disconnecting network '%(network_id)s' from gateway "
@@ -7826,11 +7850,11 @@ msgid ""
 "router:'%s'"
 msgstr "Fehler beim Arbeiten im Metadatenzugriffsnetz für Router: '%s'"
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:63
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:66
 msgid "Cannot create a gateway with an empty device list"
 msgstr "Gateway kann nicht mit einer leeren Einheitenliste erstellt werden"
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:89
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:92
 msgid "number of network gateways allowed per tenant, -1 for unlimited"
 msgstr "Anzahl an zulässigen Gateways pro Nutzer, -1 für unbegrenzt"
 

diff --git a/quantum/locale/es/LC_MESSAGES/quantum.po b/quantum/locale/es/LC_MESSAGES/quantum.po
index 0df014503833267f0e03c28bf9988329f93a6668..d048b6bf160fe10dd67f9c9b56c64ce704b98155 100644 (file)
--- a/quantum/locale/es/LC_MESSAGES/quantum.po
+++ b/quantum/locale/es/LC_MESSAGES/quantum.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-05-26 12:11+0000\n"
+"POT-Creation-Date: 2013-05-27 12:11+0000\n"
 "PO-Revision-Date: 2013-05-13 06:01+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Spanish "
@@ -2235,7 +2235,7 @@ msgid ""
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:594 quantum/plugins/nicira/QuantumPlugin.py:1773
+#: quantum/db/l3_db.py:594 quantum/plugins/nicira/QuantumPlugin.py:1778
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
@@ -2808,7 +2808,7 @@ msgid "Was expecting a dict for service definition, found the following: %s"
 msgstr ""
 
 #: quantum/extensions/servicetype.py:160
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:83
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:86
 #, python-format
 msgid "%s: provided data are not iterable"
 msgstr ""
@@ -2832,47 +2832,47 @@ msgstr ""
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:98
+#: quantum/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:184
+#: quantum/openstack/common/lockutils.py:188
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:195
+#: quantum/openstack/common/lockutils.py:199
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:222
+#: quantum/openstack/common/lockutils.py:226
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:230
+#: quantum/openstack/common/lockutils.py:234
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/log.py:226
+#: quantum/openstack/common/log.py:244
 #, python-format
 msgid "Deprecated: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:329
+#: quantum/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:379
+#: quantum/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:537
+#: quantum/openstack/common/log.py:555
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2895,120 +2895,134 @@ msgstr ""
 msgid "in dynamic looping call"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:41
+#: quantum/openstack/common/periodic_task.py:42
 #, python-format
 msgid "Unexpected argument for periodic task creation: %(arg)s."
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:132
+#: quantum/openstack/common/periodic_task.py:133
 #, python-format
 msgid "Skipping periodic task %(task)s because its interval is negative"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:137
+#: quantum/openstack/common/periodic_task.py:138
 #, python-format
 msgid "Skipping periodic task %(task)s because it is disabled"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:175
+#: quantum/openstack/common/periodic_task.py:176
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:183
+#: quantum/openstack/common/periodic_task.py:184
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:394
+#: quantum/openstack/common/policy.py:395
 #, python-format
 msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:404
+#: quantum/openstack/common/policy.py:405
 #, python-format
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:679
+#: quantum/openstack/common/policy.py:680
 #, python-format
 msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:122
+#: quantum/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:137
+#: quantum/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:162
+#: quantum/openstack/common/processutils.py:167
+#: quantum/openstack/common/processutils.py:240
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:174
+#: quantum/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: quantum/openstack/common/service.py:112
-#: quantum/openstack/common/service.py:275
+#: quantum/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
+#: quantum/openstack/common/processutils.py:221
+msgid "Environment not supported over SSH"
+msgstr ""
+
+#: quantum/openstack/common/processutils.py:225
+msgid "process_input not supported over SSH"
+msgstr ""
+
+#: quantum/openstack/common/service.py:113
+#: quantum/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: quantum/openstack/common/service.py:121
-#: quantum/openstack/common/service.py:218
+#: quantum/openstack/common/service.py:122
+#: quantum/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:164
+#: quantum/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:200
+#: quantum/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: quantum/openstack/common/service.py:223
+#: quantum/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: quantum/openstack/common/service.py:230
+#: quantum/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:240
+#: quantum/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: quantum/openstack/common/service.py:257
+#: quantum/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:261
+#: quantum/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:265
+#: quantum/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
 
-#: quantum/openstack/common/service.py:293
+#: quantum/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: quantum/openstack/common/service.py:304
+#: quantum/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -3054,131 +3068,136 @@ msgstr ""
 
 #: quantum/openstack/common/rpc/amqp.py:200
 #, python-format
-msgid "no calling threads waiting for msg_id : %s, message : %s"
+msgid "no calling threads waiting for msg_id : %(msg_id)s, message : %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:208
+#: quantum/openstack/common/rpc/amqp.py:209
 #, python-format
 msgid ""
 "Number of call waiters is greater than warning threshhold: %d. There "
 "could be a MulticallProxyWaiter leak."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:291
+#: quantum/openstack/common/rpc/amqp.py:292
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:337
+#: quantum/openstack/common/rpc/amqp.py:338
 #, python-format
 msgid "UNIQUE_ID is %s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:406
+#: quantum/openstack/common/rpc/amqp.py:407
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:414
+#: quantum/openstack/common/rpc/amqp.py:415
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:415
+#: quantum/openstack/common/rpc/amqp.py:416
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:443
+#: quantum/openstack/common/rpc/amqp.py:444
 #: quantum/openstack/common/rpc/impl_zmq.py:286
 #, python-format
 msgid "Expected exception during message handling (%s)"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:451
+#: quantum/openstack/common/rpc/amqp.py:452
 #: quantum/openstack/common/rpc/impl_zmq.py:292
 msgid "Exception during message handling"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:586
+#: quantum/openstack/common/rpc/amqp.py:587
 #, python-format
 msgid "Making synchronous call on %s ..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:589
+#: quantum/openstack/common/rpc/amqp.py:590
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:623
+#: quantum/openstack/common/rpc/amqp.py:624
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:632
+#: quantum/openstack/common/rpc/amqp.py:633
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:660
+#: quantum/openstack/common/rpc/amqp.py:661
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:74
+#: quantum/openstack/common/rpc/common.py:75
 msgid "An unknown RPC related exception occurred."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:86
+#: quantum/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:104
+#: quantum/openstack/common/rpc/common.py:105
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:121
+#: quantum/openstack/common/rpc/common.py:122
 #, python-format
 msgid ""
 "Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:"
 " \"%(method)s\" info: \"%(info)s\""
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:137
 #: quantum/openstack/common/rpc/common.py:138
 #: quantum/openstack/common/rpc/common.py:139
+#: quantum/openstack/common/rpc/common.py:140
 msgid "<unknown>"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:143
+#: quantum/openstack/common/rpc/common.py:144
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:147
+#: quantum/openstack/common/rpc/common.py:148
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:151
+#: quantum/openstack/common/rpc/common.py:152
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:156
+#: quantum/openstack/common/rpc/common.py:157
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:280
+#: quantum/openstack/common/rpc/common.py:162
+#, python-format
+msgid "Specified RPC version cap, %(version_cap)s, is too low"
+msgstr ""
+
+#: quantum/openstack/common/rpc/common.py:285
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:302
+#: quantum/openstack/common/rpc/common.py:307
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
@@ -3441,25 +3460,30 @@ msgstr ""
 msgid "No match from matchmaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:53
+#: quantum/openstack/common/rpc/impl_zmq.py:852
+#, python-format
+msgid "rpc_zmq_matchmaker = %(orig)s is deprecated; use %(new)s instead"
+msgstr ""
+
+#: quantum/openstack/common/rpc/matchmaker.py:47
 msgid "Match not found by MatchMaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:89
+#: quantum/openstack/common/rpc/matchmaker.py:83
 msgid "Matchmaker does not implement registration or heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:239
+#: quantum/openstack/common/rpc/matchmaker.py:233
 #, python-format
-msgid "Matchmaker unregistered: %s, %s"
+msgid "Matchmaker unregistered: %(key)s, %(host)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:250
+#: quantum/openstack/common/rpc/matchmaker.py:245
 msgid "Register before starting heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:343
-#: quantum/openstack/common/rpc/matchmaker.py:361
+#: quantum/openstack/common/rpc/matchmaker_ring.py:81
+#: quantum/openstack/common/rpc/matchmaker_ring.py:99
 #, python-format
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
@@ -5124,7 +5148,7 @@ msgstr ""
 #: quantum/plugins/midonet/midonet_lib.py:278
 #, python-format
 msgid ""
-"RuleManager.create_for_sg_rule: adding accept rule %(rule_id) in "
+"RuleManager.create_for_sg_rule: adding accept rule %(rule_id)s in "
 "portgroup %(port_group_id)s"
 msgstr ""
 
@@ -5222,7 +5246,7 @@ msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
 #: quantum/plugins/midonet/plugin.py:319
-#: quantum/plugins/nicira/QuantumPlugin.py:1025
+#: quantum/plugins/nicira/QuantumPlugin.py:1030
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
@@ -6089,408 +6113,408 @@ msgstr ""
 msgid "The request has timed out."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:223
+#: quantum/plugins/nicira/QuantumPlugin.py:228
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:258
+#: quantum/plugins/nicira/QuantumPlugin.py:263
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:260
+#: quantum/plugins/nicira/QuantumPlugin.py:265
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:263
+#: quantum/plugins/nicira/QuantumPlugin.py:268
 #, python-format
 msgid ""
 "Unable to create logical router port for quantum port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:285
+#: quantum/plugins/nicira/QuantumPlugin.py:290
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:291
+#: quantum/plugins/nicira/QuantumPlugin.py:296
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
 "associated with Quantum %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:297
+#: quantum/plugins/nicira/QuantumPlugin.py:302
 #, python-format
 msgid ""
 "Unable to plug attachment in router port %(r_port_id)s for quantum port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:342
+#: quantum/plugins/nicira/QuantumPlugin.py:347
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:367
-#: quantum/plugins/nicira/QuantumPlugin.py:402
-#: quantum/plugins/nicira/QuantumPlugin.py:592
+#: quantum/plugins/nicira/QuantumPlugin.py:372
+#: quantum/plugins/nicira/QuantumPlugin.py:407
+#: quantum/plugins/nicira/QuantumPlugin.py:597
 #, python-format
 msgid ""
 "NVP plugin does not support regular VIF ports on external networks. Port "
 "%s will be down."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:387
-#: quantum/plugins/nicira/QuantumPlugin.py:468
-#: quantum/plugins/nicira/QuantumPlugin.py:612
+#: quantum/plugins/nicira/QuantumPlugin.py:392
+#: quantum/plugins/nicira/QuantumPlugin.py:473
+#: quantum/plugins/nicira/QuantumPlugin.py:617
 #, python-format
 msgid ""
 "_nvp_create_port completed for port %(name)s on network %(network_id)s. "
 "The new port id is %(id)s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:391
+#: quantum/plugins/nicira/QuantumPlugin.py:396
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:409
+#: quantum/plugins/nicira/QuantumPlugin.py:414
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:418
+#: quantum/plugins/nicira/QuantumPlugin.py:423
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:424
+#: quantum/plugins/nicira/QuantumPlugin.py:429
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:443
-#: quantum/plugins/nicira/QuantumPlugin.py:876
+#: quantum/plugins/nicira/QuantumPlugin.py:448
+#: quantum/plugins/nicira/QuantumPlugin.py:881
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:455
+#: quantum/plugins/nicira/QuantumPlugin.py:460
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:473
+#: quantum/plugins/nicira/QuantumPlugin.py:478
 msgid "An exception occured while plugging the interface"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:481
+#: quantum/plugins/nicira/QuantumPlugin.py:486
 #, python-format
 msgid ""
 "device_id field must be populated in order to create an external gateway "
 "port for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:489
+#: quantum/plugins/nicira/QuantumPlugin.py:494
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:535
+#: quantum/plugins/nicira/QuantumPlugin.py:540
 #, python-format
 msgid ""
 "_nvp_create_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s. NVP port id is %(nvp_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:573
+#: quantum/plugins/nicira/QuantumPlugin.py:578
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:577
-#: quantum/plugins/nicira/QuantumPlugin.py:1718
+#: quantum/plugins/nicira/QuantumPlugin.py:582
+#: quantum/plugins/nicira/QuantumPlugin.py:1723
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:579
+#: quantum/plugins/nicira/QuantumPlugin.py:584
 #, python-format
 msgid ""
 "_nvp_delete_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:617
+#: quantum/plugins/nicira/QuantumPlugin.py:622
 #, python-format
 msgid "An exception occured while plugging the gateway interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:657
+#: quantum/plugins/nicira/QuantumPlugin.py:662
 #, python-format
 msgid "Unable to find NVP uuid for Quantum port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:686
+#: quantum/plugins/nicira/QuantumPlugin.py:691
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:690
+#: quantum/plugins/nicira/QuantumPlugin.py:695
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:694
+#: quantum/plugins/nicira/QuantumPlugin.py:699
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:698
-#: quantum/plugins/nicira/QuantumPlugin.py:713
+#: quantum/plugins/nicira/QuantumPlugin.py:703
+#: quantum/plugins/nicira/QuantumPlugin.py:718
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:719
+#: quantum/plugins/nicira/QuantumPlugin.py:724
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:750
+#: quantum/plugins/nicira/QuantumPlugin.py:755
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:772
+#: quantum/plugins/nicira/QuantumPlugin.py:777
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:799
+#: quantum/plugins/nicira/QuantumPlugin.py:804
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not yet supported by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:858
+#: quantum/plugins/nicira/QuantumPlugin.py:863
 #, python-format
 msgid "A nvp lport identifier was not found for quantum port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:886
+#: quantum/plugins/nicira/QuantumPlugin.py:891
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:889
+#: quantum/plugins/nicira/QuantumPlugin.py:894
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:915
+#: quantum/plugins/nicira/QuantumPlugin.py:920
 #, python-format
 msgid ""
 "Current network status:%(nvp_net_status)s; Status in Quantum "
 "DB:%(quantum_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:925
-#: quantum/plugins/nicira/QuantumPlugin.py:975
+#: quantum/plugins/nicira/QuantumPlugin.py:930
+#: quantum/plugins/nicira/QuantumPlugin.py:980
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:989
+#: quantum/plugins/nicira/QuantumPlugin.py:994
 #, python-format
 msgid "Logical Switch %s found in quantum database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1004
+#: quantum/plugins/nicira/QuantumPlugin.py:1009
 #, python-format
 msgid ""
 "Found %s logical switches not bound to Quantum networks. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1008
+#: quantum/plugins/nicira/QuantumPlugin.py:1013
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1091
+#: quantum/plugins/nicira/QuantumPlugin.py:1096
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1100
+#: quantum/plugins/nicira/QuantumPlugin.py:1105
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1127
+#: quantum/plugins/nicira/QuantumPlugin.py:1132
 #, python-format
 msgid "Quantum logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1134
+#: quantum/plugins/nicira/QuantumPlugin.py:1139
 #, python-format
 msgid ""
 "Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1196
+#: quantum/plugins/nicira/QuantumPlugin.py:1201
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1202
+#: quantum/plugins/nicira/QuantumPlugin.py:1207
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1207
+#: quantum/plugins/nicira/QuantumPlugin.py:1212
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1271
+#: quantum/plugins/nicira/QuantumPlugin.py:1276
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1296
+#: quantum/plugins/nicira/QuantumPlugin.py:1301
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1410
-#: quantum/plugins/nicira/QuantumPlugin.py:1455
+#: quantum/plugins/nicira/QuantumPlugin.py:1415
+#: quantum/plugins/nicira/QuantumPlugin.py:1460
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1423
+#: quantum/plugins/nicira/QuantumPlugin.py:1428
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1465
+#: quantum/plugins/nicira/QuantumPlugin.py:1470
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1468
+#: quantum/plugins/nicira/QuantumPlugin.py:1473
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1488
+#: quantum/plugins/nicira/QuantumPlugin.py:1493
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1492
+#: quantum/plugins/nicira/QuantumPlugin.py:1497
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1513
+#: quantum/plugins/nicira/QuantumPlugin.py:1518
 #, python-format
 msgid ""
 "Current router status:%(router_status)s;Status in Quantum "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1521
+#: quantum/plugins/nicira/QuantumPlugin.py:1526
 msgid "Unable to get logical router"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1544
+#: quantum/plugins/nicira/QuantumPlugin.py:1549
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1566
+#: quantum/plugins/nicira/QuantumPlugin.py:1571
 #, python-format
 msgid ""
 "Found %s logical routers not bound to Quantum routers. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1593
+#: quantum/plugins/nicira/QuantumPlugin.py:1598
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1628
+#: quantum/plugins/nicira/QuantumPlugin.py:1633
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1673
+#: quantum/plugins/nicira/QuantumPlugin.py:1678
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1685
+#: quantum/plugins/nicira/QuantumPlugin.py:1690
 #, python-format
 msgid ""
 "Unable to find NVP logical router port for Quantum port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1714
+#: quantum/plugins/nicira/QuantumPlugin.py:1719
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1740
+#: quantum/plugins/nicira/QuantumPlugin.py:1745
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1746
+#: quantum/plugins/nicira/QuantumPlugin.py:1751
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1812
+#: quantum/plugins/nicira/QuantumPlugin.py:1817
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1836
+#: quantum/plugins/nicira/QuantumPlugin.py:1841
 #, python-format
 msgid ""
 "An error occurred while creating NAT rules on the NVP platform for "
 "floating ip:%(floating_ip)s mapped to internal ip:%(internal_ip)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1878
+#: quantum/plugins/nicira/QuantumPlugin.py:1883
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1881
+#: quantum/plugins/nicira/QuantumPlugin.py:1886
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1907
+#: quantum/plugins/nicira/QuantumPlugin.py:1912
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1929
+#: quantum/plugins/nicira/QuantumPlugin.py:1934
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
@@ -6536,69 +6560,69 @@ msgstr ""
 msgid "The network gateway %(gateway_id)s cannot be updated or deleted"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:152
+#: quantum/plugins/nicira/nicira_networkgw_db.py:160
 msgid ""
 "A network identifier must be specified when connecting a network to a "
 "network gateway. Unable to complete operation"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:158
+#: quantum/plugins/nicira/nicira_networkgw_db.py:166
 #, python-format
 msgid ""
 "Invalid keys found among the ones provided in request body: "
 "%(connection_attrs)s."
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:164
+#: quantum/plugins/nicira/nicira_networkgw_db.py:172
 msgid ""
 "In order to specify a segmentation id the segmentation type must be "
 "specified as well"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:168
+#: quantum/plugins/nicira/nicira_networkgw_db.py:176
 msgid "Cannot specify a segmentation id when the segmentation type is flat"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:217
+#: quantum/plugins/nicira/nicira_networkgw_db.py:225
 #, python-format
 msgid "Created network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:230
+#: quantum/plugins/nicira/nicira_networkgw_db.py:237
 #, python-format
 msgid "Updated network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:245
+#: quantum/plugins/nicira/nicira_networkgw_db.py:252
 #, python-format
 msgid "Network gateway '%s' was destroyed."
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:255
+#: quantum/plugins/nicira/nicira_networkgw_db.py:262
 #, python-format
 msgid "Connecting network '%(network_id)s' to gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:296
+#: quantum/plugins/nicira/nicira_networkgw_db.py:303
 #, python-format
 msgid ""
 "Requested network '%(network_id)s' not found.Unable to create network "
 "connection on gateway '%(network_gateway_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:304
+#: quantum/plugins/nicira/nicira_networkgw_db.py:311
 #, python-format
 msgid ""
 "Gateway port for '%(network_gateway_id)s' created on network "
 "'%(network_id)s':%(port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:320
+#: quantum/plugins/nicira/nicira_networkgw_db.py:327
 #, python-format
 msgid "Ensured no Ip addresses are configured on port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:330
+#: quantum/plugins/nicira/nicira_networkgw_db.py:337
 #, python-format
 msgid ""
 "Disconnecting network '%(network_id)s' from gateway "
@@ -7229,11 +7253,11 @@ msgid ""
 "router:'%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:63
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:66
 msgid "Cannot create a gateway with an empty device list"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:89
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:92
 msgid "number of network gateways allowed per tenant, -1 for unlimited"
 msgstr ""
 
@@ -7970,3 +7994,14 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
+#~ msgid "no calling threads waiting for msg_id : %s, message : %s"
+#~ msgstr ""
+
+#~ msgid "Matchmaker unregistered: %s, %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "RuleManager.create_for_sg_rule: adding accept rule"
+#~ " %(rule_id) in portgroup %(port_group_id)s"
+#~ msgstr ""
+

diff --git a/quantum/locale/fi_FI/LC_MESSAGES/quantum.po b/quantum/locale/fi_FI/LC_MESSAGES/quantum.po
index 638879335dfb32a80fb0de58b7e04c0030e19e8b..4c551da7aead74ff19fd86b2ac6f7c5b87009b34 100644 (file)
--- a/quantum/locale/fi_FI/LC_MESSAGES/quantum.po
+++ b/quantum/locale/fi_FI/LC_MESSAGES/quantum.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-05-26 12:11+0000\n"
+"POT-Creation-Date: 2013-05-27 12:11+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish (Finland) "
@@ -2235,7 +2235,7 @@ msgid ""
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:594 quantum/plugins/nicira/QuantumPlugin.py:1773
+#: quantum/db/l3_db.py:594 quantum/plugins/nicira/QuantumPlugin.py:1778
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
@@ -2808,7 +2808,7 @@ msgid "Was expecting a dict for service definition, found the following: %s"
 msgstr ""
 
 #: quantum/extensions/servicetype.py:160
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:83
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:86
 #, python-format
 msgid "%s: provided data are not iterable"
 msgstr ""
@@ -2832,47 +2832,47 @@ msgstr ""
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:98
+#: quantum/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:184
+#: quantum/openstack/common/lockutils.py:188
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:195
+#: quantum/openstack/common/lockutils.py:199
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:222
+#: quantum/openstack/common/lockutils.py:226
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:230
+#: quantum/openstack/common/lockutils.py:234
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/log.py:226
+#: quantum/openstack/common/log.py:244
 #, python-format
 msgid "Deprecated: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:329
+#: quantum/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:379
+#: quantum/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:537
+#: quantum/openstack/common/log.py:555
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2895,120 +2895,134 @@ msgstr ""
 msgid "in dynamic looping call"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:41
+#: quantum/openstack/common/periodic_task.py:42
 #, python-format
 msgid "Unexpected argument for periodic task creation: %(arg)s."
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:132
+#: quantum/openstack/common/periodic_task.py:133
 #, python-format
 msgid "Skipping periodic task %(task)s because its interval is negative"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:137
+#: quantum/openstack/common/periodic_task.py:138
 #, python-format
 msgid "Skipping periodic task %(task)s because it is disabled"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:175
+#: quantum/openstack/common/periodic_task.py:176
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:183
+#: quantum/openstack/common/periodic_task.py:184
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:394
+#: quantum/openstack/common/policy.py:395
 #, python-format
 msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:404
+#: quantum/openstack/common/policy.py:405
 #, python-format
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:679
+#: quantum/openstack/common/policy.py:680
 #, python-format
 msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:122
+#: quantum/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:137
+#: quantum/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:162
+#: quantum/openstack/common/processutils.py:167
+#: quantum/openstack/common/processutils.py:240
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:174
+#: quantum/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: quantum/openstack/common/service.py:112
-#: quantum/openstack/common/service.py:275
+#: quantum/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
+#: quantum/openstack/common/processutils.py:221
+msgid "Environment not supported over SSH"
+msgstr ""
+
+#: quantum/openstack/common/processutils.py:225
+msgid "process_input not supported over SSH"
+msgstr ""
+
+#: quantum/openstack/common/service.py:113
+#: quantum/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: quantum/openstack/common/service.py:121
-#: quantum/openstack/common/service.py:218
+#: quantum/openstack/common/service.py:122
+#: quantum/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:164
+#: quantum/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:200
+#: quantum/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: quantum/openstack/common/service.py:223
+#: quantum/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: quantum/openstack/common/service.py:230
+#: quantum/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:240
+#: quantum/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: quantum/openstack/common/service.py:257
+#: quantum/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:261
+#: quantum/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:265
+#: quantum/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
 
-#: quantum/openstack/common/service.py:293
+#: quantum/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: quantum/openstack/common/service.py:304
+#: quantum/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -3054,131 +3068,136 @@ msgstr ""
 
 #: quantum/openstack/common/rpc/amqp.py:200
 #, python-format
-msgid "no calling threads waiting for msg_id : %s, message : %s"
+msgid "no calling threads waiting for msg_id : %(msg_id)s, message : %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:208
+#: quantum/openstack/common/rpc/amqp.py:209
 #, python-format
 msgid ""
 "Number of call waiters is greater than warning threshhold: %d. There "
 "could be a MulticallProxyWaiter leak."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:291
+#: quantum/openstack/common/rpc/amqp.py:292
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:337
+#: quantum/openstack/common/rpc/amqp.py:338
 #, python-format
 msgid "UNIQUE_ID is %s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:406
+#: quantum/openstack/common/rpc/amqp.py:407
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:414
+#: quantum/openstack/common/rpc/amqp.py:415
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:415
+#: quantum/openstack/common/rpc/amqp.py:416
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:443
+#: quantum/openstack/common/rpc/amqp.py:444
 #: quantum/openstack/common/rpc/impl_zmq.py:286
 #, python-format
 msgid "Expected exception during message handling (%s)"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:451
+#: quantum/openstack/common/rpc/amqp.py:452
 #: quantum/openstack/common/rpc/impl_zmq.py:292
 msgid "Exception during message handling"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:586
+#: quantum/openstack/common/rpc/amqp.py:587
 #, python-format
 msgid "Making synchronous call on %s ..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:589
+#: quantum/openstack/common/rpc/amqp.py:590
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:623
+#: quantum/openstack/common/rpc/amqp.py:624
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:632
+#: quantum/openstack/common/rpc/amqp.py:633
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:660
+#: quantum/openstack/common/rpc/amqp.py:661
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:74
+#: quantum/openstack/common/rpc/common.py:75
 msgid "An unknown RPC related exception occurred."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:86
+#: quantum/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:104
+#: quantum/openstack/common/rpc/common.py:105
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:121
+#: quantum/openstack/common/rpc/common.py:122
 #, python-format
 msgid ""
 "Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:"
 " \"%(method)s\" info: \"%(info)s\""
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:137
 #: quantum/openstack/common/rpc/common.py:138
 #: quantum/openstack/common/rpc/common.py:139
+#: quantum/openstack/common/rpc/common.py:140
 msgid "<unknown>"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:143
+#: quantum/openstack/common/rpc/common.py:144
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:147
+#: quantum/openstack/common/rpc/common.py:148
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:151
+#: quantum/openstack/common/rpc/common.py:152
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:156
+#: quantum/openstack/common/rpc/common.py:157
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:280
+#: quantum/openstack/common/rpc/common.py:162
+#, python-format
+msgid "Specified RPC version cap, %(version_cap)s, is too low"
+msgstr ""
+
+#: quantum/openstack/common/rpc/common.py:285
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:302
+#: quantum/openstack/common/rpc/common.py:307
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
@@ -3441,25 +3460,30 @@ msgstr ""
 msgid "No match from matchmaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:53
+#: quantum/openstack/common/rpc/impl_zmq.py:852
+#, python-format
+msgid "rpc_zmq_matchmaker = %(orig)s is deprecated; use %(new)s instead"
+msgstr ""
+
+#: quantum/openstack/common/rpc/matchmaker.py:47
 msgid "Match not found by MatchMaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:89
+#: quantum/openstack/common/rpc/matchmaker.py:83
 msgid "Matchmaker does not implement registration or heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:239
+#: quantum/openstack/common/rpc/matchmaker.py:233
 #, python-format
-msgid "Matchmaker unregistered: %s, %s"
+msgid "Matchmaker unregistered: %(key)s, %(host)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:250
+#: quantum/openstack/common/rpc/matchmaker.py:245
 msgid "Register before starting heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:343
-#: quantum/openstack/common/rpc/matchmaker.py:361
+#: quantum/openstack/common/rpc/matchmaker_ring.py:81
+#: quantum/openstack/common/rpc/matchmaker_ring.py:99
 #, python-format
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
@@ -5124,7 +5148,7 @@ msgstr ""
 #: quantum/plugins/midonet/midonet_lib.py:278
 #, python-format
 msgid ""
-"RuleManager.create_for_sg_rule: adding accept rule %(rule_id) in "
+"RuleManager.create_for_sg_rule: adding accept rule %(rule_id)s in "
 "portgroup %(port_group_id)s"
 msgstr ""
 
@@ -5222,7 +5246,7 @@ msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
 #: quantum/plugins/midonet/plugin.py:319
-#: quantum/plugins/nicira/QuantumPlugin.py:1025
+#: quantum/plugins/nicira/QuantumPlugin.py:1030
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
@@ -6089,408 +6113,408 @@ msgstr ""
 msgid "The request has timed out."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:223
+#: quantum/plugins/nicira/QuantumPlugin.py:228
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:258
+#: quantum/plugins/nicira/QuantumPlugin.py:263
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:260
+#: quantum/plugins/nicira/QuantumPlugin.py:265
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:263
+#: quantum/plugins/nicira/QuantumPlugin.py:268
 #, python-format
 msgid ""
 "Unable to create logical router port for quantum port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:285
+#: quantum/plugins/nicira/QuantumPlugin.py:290
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:291
+#: quantum/plugins/nicira/QuantumPlugin.py:296
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
 "associated with Quantum %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:297
+#: quantum/plugins/nicira/QuantumPlugin.py:302
 #, python-format
 msgid ""
 "Unable to plug attachment in router port %(r_port_id)s for quantum port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:342
+#: quantum/plugins/nicira/QuantumPlugin.py:347
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:367
-#: quantum/plugins/nicira/QuantumPlugin.py:402
-#: quantum/plugins/nicira/QuantumPlugin.py:592
+#: quantum/plugins/nicira/QuantumPlugin.py:372
+#: quantum/plugins/nicira/QuantumPlugin.py:407
+#: quantum/plugins/nicira/QuantumPlugin.py:597
 #, python-format
 msgid ""
 "NVP plugin does not support regular VIF ports on external networks. Port "
 "%s will be down."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:387
-#: quantum/plugins/nicira/QuantumPlugin.py:468
-#: quantum/plugins/nicira/QuantumPlugin.py:612
+#: quantum/plugins/nicira/QuantumPlugin.py:392
+#: quantum/plugins/nicira/QuantumPlugin.py:473
+#: quantum/plugins/nicira/QuantumPlugin.py:617
 #, python-format
 msgid ""
 "_nvp_create_port completed for port %(name)s on network %(network_id)s. "
 "The new port id is %(id)s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:391
+#: quantum/plugins/nicira/QuantumPlugin.py:396
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:409
+#: quantum/plugins/nicira/QuantumPlugin.py:414
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:418
+#: quantum/plugins/nicira/QuantumPlugin.py:423
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:424
+#: quantum/plugins/nicira/QuantumPlugin.py:429
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:443
-#: quantum/plugins/nicira/QuantumPlugin.py:876
+#: quantum/plugins/nicira/QuantumPlugin.py:448
+#: quantum/plugins/nicira/QuantumPlugin.py:881
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:455
+#: quantum/plugins/nicira/QuantumPlugin.py:460
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:473
+#: quantum/plugins/nicira/QuantumPlugin.py:478
 msgid "An exception occured while plugging the interface"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:481
+#: quantum/plugins/nicira/QuantumPlugin.py:486
 #, python-format
 msgid ""
 "device_id field must be populated in order to create an external gateway "
 "port for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:489
+#: quantum/plugins/nicira/QuantumPlugin.py:494
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:535
+#: quantum/plugins/nicira/QuantumPlugin.py:540
 #, python-format
 msgid ""
 "_nvp_create_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s. NVP port id is %(nvp_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:573
+#: quantum/plugins/nicira/QuantumPlugin.py:578
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:577
-#: quantum/plugins/nicira/QuantumPlugin.py:1718
+#: quantum/plugins/nicira/QuantumPlugin.py:582
+#: quantum/plugins/nicira/QuantumPlugin.py:1723
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:579
+#: quantum/plugins/nicira/QuantumPlugin.py:584
 #, python-format
 msgid ""
 "_nvp_delete_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:617
+#: quantum/plugins/nicira/QuantumPlugin.py:622
 #, python-format
 msgid "An exception occured while plugging the gateway interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:657
+#: quantum/plugins/nicira/QuantumPlugin.py:662
 #, python-format
 msgid "Unable to find NVP uuid for Quantum port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:686
+#: quantum/plugins/nicira/QuantumPlugin.py:691
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:690
+#: quantum/plugins/nicira/QuantumPlugin.py:695
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:694
+#: quantum/plugins/nicira/QuantumPlugin.py:699
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:698
-#: quantum/plugins/nicira/QuantumPlugin.py:713
+#: quantum/plugins/nicira/QuantumPlugin.py:703
+#: quantum/plugins/nicira/QuantumPlugin.py:718
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:719
+#: quantum/plugins/nicira/QuantumPlugin.py:724
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:750
+#: quantum/plugins/nicira/QuantumPlugin.py:755
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:772
+#: quantum/plugins/nicira/QuantumPlugin.py:777
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:799
+#: quantum/plugins/nicira/QuantumPlugin.py:804
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not yet supported by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:858
+#: quantum/plugins/nicira/QuantumPlugin.py:863
 #, python-format
 msgid "A nvp lport identifier was not found for quantum port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:886
+#: quantum/plugins/nicira/QuantumPlugin.py:891
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:889
+#: quantum/plugins/nicira/QuantumPlugin.py:894
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:915
+#: quantum/plugins/nicira/QuantumPlugin.py:920
 #, python-format
 msgid ""
 "Current network status:%(nvp_net_status)s; Status in Quantum "
 "DB:%(quantum_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:925
-#: quantum/plugins/nicira/QuantumPlugin.py:975
+#: quantum/plugins/nicira/QuantumPlugin.py:930
+#: quantum/plugins/nicira/QuantumPlugin.py:980
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:989
+#: quantum/plugins/nicira/QuantumPlugin.py:994
 #, python-format
 msgid "Logical Switch %s found in quantum database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1004
+#: quantum/plugins/nicira/QuantumPlugin.py:1009
 #, python-format
 msgid ""
 "Found %s logical switches not bound to Quantum networks. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1008
+#: quantum/plugins/nicira/QuantumPlugin.py:1013
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1091
+#: quantum/plugins/nicira/QuantumPlugin.py:1096
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1100
+#: quantum/plugins/nicira/QuantumPlugin.py:1105
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1127
+#: quantum/plugins/nicira/QuantumPlugin.py:1132
 #, python-format
 msgid "Quantum logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1134
+#: quantum/plugins/nicira/QuantumPlugin.py:1139
 #, python-format
 msgid ""
 "Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1196
+#: quantum/plugins/nicira/QuantumPlugin.py:1201
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1202
+#: quantum/plugins/nicira/QuantumPlugin.py:1207
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1207
+#: quantum/plugins/nicira/QuantumPlugin.py:1212
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1271
+#: quantum/plugins/nicira/QuantumPlugin.py:1276
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1296
+#: quantum/plugins/nicira/QuantumPlugin.py:1301
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1410
-#: quantum/plugins/nicira/QuantumPlugin.py:1455
+#: quantum/plugins/nicira/QuantumPlugin.py:1415
+#: quantum/plugins/nicira/QuantumPlugin.py:1460
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1423
+#: quantum/plugins/nicira/QuantumPlugin.py:1428
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1465
+#: quantum/plugins/nicira/QuantumPlugin.py:1470
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1468
+#: quantum/plugins/nicira/QuantumPlugin.py:1473
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1488
+#: quantum/plugins/nicira/QuantumPlugin.py:1493
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1492
+#: quantum/plugins/nicira/QuantumPlugin.py:1497
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1513
+#: quantum/plugins/nicira/QuantumPlugin.py:1518
 #, python-format
 msgid ""
 "Current router status:%(router_status)s;Status in Quantum "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1521
+#: quantum/plugins/nicira/QuantumPlugin.py:1526
 msgid "Unable to get logical router"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1544
+#: quantum/plugins/nicira/QuantumPlugin.py:1549
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1566
+#: quantum/plugins/nicira/QuantumPlugin.py:1571
 #, python-format
 msgid ""
 "Found %s logical routers not bound to Quantum routers. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1593
+#: quantum/plugins/nicira/QuantumPlugin.py:1598
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1628
+#: quantum/plugins/nicira/QuantumPlugin.py:1633
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1673
+#: quantum/plugins/nicira/QuantumPlugin.py:1678
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1685
+#: quantum/plugins/nicira/QuantumPlugin.py:1690
 #, python-format
 msgid ""
 "Unable to find NVP logical router port for Quantum port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1714
+#: quantum/plugins/nicira/QuantumPlugin.py:1719
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1740
+#: quantum/plugins/nicira/QuantumPlugin.py:1745
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1746
+#: quantum/plugins/nicira/QuantumPlugin.py:1751
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1812
+#: quantum/plugins/nicira/QuantumPlugin.py:1817
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1836
+#: quantum/plugins/nicira/QuantumPlugin.py:1841
 #, python-format
 msgid ""
 "An error occurred while creating NAT rules on the NVP platform for "
 "floating ip:%(floating_ip)s mapped to internal ip:%(internal_ip)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1878
+#: quantum/plugins/nicira/QuantumPlugin.py:1883
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1881
+#: quantum/plugins/nicira/QuantumPlugin.py:1886
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1907
+#: quantum/plugins/nicira/QuantumPlugin.py:1912
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1929
+#: quantum/plugins/nicira/QuantumPlugin.py:1934
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
@@ -6536,69 +6560,69 @@ msgstr ""
 msgid "The network gateway %(gateway_id)s cannot be updated or deleted"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:152
+#: quantum/plugins/nicira/nicira_networkgw_db.py:160
 msgid ""
 "A network identifier must be specified when connecting a network to a "
 "network gateway. Unable to complete operation"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:158
+#: quantum/plugins/nicira/nicira_networkgw_db.py:166
 #, python-format
 msgid ""
 "Invalid keys found among the ones provided in request body: "
 "%(connection_attrs)s."
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:164
+#: quantum/plugins/nicira/nicira_networkgw_db.py:172
 msgid ""
 "In order to specify a segmentation id the segmentation type must be "
 "specified as well"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:168
+#: quantum/plugins/nicira/nicira_networkgw_db.py:176
 msgid "Cannot specify a segmentation id when the segmentation type is flat"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:217
+#: quantum/plugins/nicira/nicira_networkgw_db.py:225
 #, python-format
 msgid "Created network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:230
+#: quantum/plugins/nicira/nicira_networkgw_db.py:237
 #, python-format
 msgid "Updated network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:245
+#: quantum/plugins/nicira/nicira_networkgw_db.py:252
 #, python-format
 msgid "Network gateway '%s' was destroyed."
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:255
+#: quantum/plugins/nicira/nicira_networkgw_db.py:262
 #, python-format
 msgid "Connecting network '%(network_id)s' to gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:296
+#: quantum/plugins/nicira/nicira_networkgw_db.py:303
 #, python-format
 msgid ""
 "Requested network '%(network_id)s' not found.Unable to create network "
 "connection on gateway '%(network_gateway_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:304
+#: quantum/plugins/nicira/nicira_networkgw_db.py:311
 #, python-format
 msgid ""
 "Gateway port for '%(network_gateway_id)s' created on network "
 "'%(network_id)s':%(port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:320
+#: quantum/plugins/nicira/nicira_networkgw_db.py:327
 #, python-format
 msgid "Ensured no Ip addresses are configured on port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:330
+#: quantum/plugins/nicira/nicira_networkgw_db.py:337
 #, python-format
 msgid ""
 "Disconnecting network '%(network_id)s' from gateway "
@@ -7229,11 +7253,11 @@ msgid ""
 "router:'%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:63
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:66
 msgid "Cannot create a gateway with an empty device list"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:89
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:92
 msgid "number of network gateways allowed per tenant, -1 for unlimited"
 msgstr ""
 
@@ -7970,3 +7994,14 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
+#~ msgid "no calling threads waiting for msg_id : %s, message : %s"
+#~ msgstr ""
+
+#~ msgid "Matchmaker unregistered: %s, %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "RuleManager.create_for_sg_rule: adding accept rule"
+#~ " %(rule_id) in portgroup %(port_group_id)s"
+#~ msgstr ""
+

diff --git a/quantum/locale/fr/LC_MESSAGES/quantum.po b/quantum/locale/fr/LC_MESSAGES/quantum.po
index dedb34c3c7d54a5dee7aebbe89ca77de983f085b..84a1c07d73756d90c45e07fbbffd4c3f4939c36b 100644 (file)
--- a/quantum/locale/fr/LC_MESSAGES/quantum.po
+++ b/quantum/locale/fr/LC_MESSAGES/quantum.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-05-26 12:11+0000\n"
+"POT-Creation-Date: 2013-05-27 12:11+0000\n"
 "PO-Revision-Date: 2013-05-13 06:01+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: French "
@@ -2235,7 +2235,7 @@ msgid ""
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:594 quantum/plugins/nicira/QuantumPlugin.py:1773
+#: quantum/db/l3_db.py:594 quantum/plugins/nicira/QuantumPlugin.py:1778
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
@@ -2808,7 +2808,7 @@ msgid "Was expecting a dict for service definition, found the following: %s"
 msgstr ""
 
 #: quantum/extensions/servicetype.py:160
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:83
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:86
 #, python-format
 msgid "%s: provided data are not iterable"
 msgstr ""
@@ -2832,47 +2832,47 @@ msgstr ""
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:98
+#: quantum/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:184
+#: quantum/openstack/common/lockutils.py:188
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:195
+#: quantum/openstack/common/lockutils.py:199
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:222
+#: quantum/openstack/common/lockutils.py:226
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:230
+#: quantum/openstack/common/lockutils.py:234
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/log.py:226
+#: quantum/openstack/common/log.py:244
 #, python-format
 msgid "Deprecated: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:329
+#: quantum/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:379
+#: quantum/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:537
+#: quantum/openstack/common/log.py:555
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2895,120 +2895,134 @@ msgstr ""
 msgid "in dynamic looping call"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:41
+#: quantum/openstack/common/periodic_task.py:42
 #, python-format
 msgid "Unexpected argument for periodic task creation: %(arg)s."
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:132
+#: quantum/openstack/common/periodic_task.py:133
 #, python-format
 msgid "Skipping periodic task %(task)s because its interval is negative"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:137
+#: quantum/openstack/common/periodic_task.py:138
 #, python-format
 msgid "Skipping periodic task %(task)s because it is disabled"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:175
+#: quantum/openstack/common/periodic_task.py:176
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:183
+#: quantum/openstack/common/periodic_task.py:184
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:394
+#: quantum/openstack/common/policy.py:395
 #, python-format
 msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:404
+#: quantum/openstack/common/policy.py:405
 #, python-format
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:679
+#: quantum/openstack/common/policy.py:680
 #, python-format
 msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:122
+#: quantum/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:137
+#: quantum/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:162
+#: quantum/openstack/common/processutils.py:167
+#: quantum/openstack/common/processutils.py:240
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:174
+#: quantum/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: quantum/openstack/common/service.py:112
-#: quantum/openstack/common/service.py:275
+#: quantum/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
+#: quantum/openstack/common/processutils.py:221
+msgid "Environment not supported over SSH"
+msgstr ""
+
+#: quantum/openstack/common/processutils.py:225
+msgid "process_input not supported over SSH"
+msgstr ""
+
+#: quantum/openstack/common/service.py:113
+#: quantum/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: quantum/openstack/common/service.py:121
-#: quantum/openstack/common/service.py:218
+#: quantum/openstack/common/service.py:122
+#: quantum/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:164
+#: quantum/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:200
+#: quantum/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: quantum/openstack/common/service.py:223
+#: quantum/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: quantum/openstack/common/service.py:230
+#: quantum/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:240
+#: quantum/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: quantum/openstack/common/service.py:257
+#: quantum/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:261
+#: quantum/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:265
+#: quantum/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
 
-#: quantum/openstack/common/service.py:293
+#: quantum/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: quantum/openstack/common/service.py:304
+#: quantum/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -3054,131 +3068,136 @@ msgstr ""
 
 #: quantum/openstack/common/rpc/amqp.py:200
 #, python-format
-msgid "no calling threads waiting for msg_id : %s, message : %s"
+msgid "no calling threads waiting for msg_id : %(msg_id)s, message : %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:208
+#: quantum/openstack/common/rpc/amqp.py:209
 #, python-format
 msgid ""
 "Number of call waiters is greater than warning threshhold: %d. There "
 "could be a MulticallProxyWaiter leak."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:291
+#: quantum/openstack/common/rpc/amqp.py:292
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:337
+#: quantum/openstack/common/rpc/amqp.py:338
 #, python-format
 msgid "UNIQUE_ID is %s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:406
+#: quantum/openstack/common/rpc/amqp.py:407
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:414
+#: quantum/openstack/common/rpc/amqp.py:415
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:415
+#: quantum/openstack/common/rpc/amqp.py:416
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:443
+#: quantum/openstack/common/rpc/amqp.py:444
 #: quantum/openstack/common/rpc/impl_zmq.py:286
 #, python-format
 msgid "Expected exception during message handling (%s)"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:451
+#: quantum/openstack/common/rpc/amqp.py:452
 #: quantum/openstack/common/rpc/impl_zmq.py:292
 msgid "Exception during message handling"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:586
+#: quantum/openstack/common/rpc/amqp.py:587
 #, python-format
 msgid "Making synchronous call on %s ..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:589
+#: quantum/openstack/common/rpc/amqp.py:590
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:623
+#: quantum/openstack/common/rpc/amqp.py:624
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:632
+#: quantum/openstack/common/rpc/amqp.py:633
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:660
+#: quantum/openstack/common/rpc/amqp.py:661
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:74
+#: quantum/openstack/common/rpc/common.py:75
 msgid "An unknown RPC related exception occurred."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:86
+#: quantum/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:104
+#: quantum/openstack/common/rpc/common.py:105
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:121
+#: quantum/openstack/common/rpc/common.py:122
 #, python-format
 msgid ""
 "Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:"
 " \"%(method)s\" info: \"%(info)s\""
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:137
 #: quantum/openstack/common/rpc/common.py:138
 #: quantum/openstack/common/rpc/common.py:139
+#: quantum/openstack/common/rpc/common.py:140
 msgid "<unknown>"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:143
+#: quantum/openstack/common/rpc/common.py:144
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:147
+#: quantum/openstack/common/rpc/common.py:148
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:151
+#: quantum/openstack/common/rpc/common.py:152
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:156
+#: quantum/openstack/common/rpc/common.py:157
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:280
+#: quantum/openstack/common/rpc/common.py:162
+#, python-format
+msgid "Specified RPC version cap, %(version_cap)s, is too low"
+msgstr ""
+
+#: quantum/openstack/common/rpc/common.py:285
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:302
+#: quantum/openstack/common/rpc/common.py:307
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
@@ -3441,25 +3460,30 @@ msgstr ""
 msgid "No match from matchmaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:53
+#: quantum/openstack/common/rpc/impl_zmq.py:852
+#, python-format
+msgid "rpc_zmq_matchmaker = %(orig)s is deprecated; use %(new)s instead"
+msgstr ""
+
+#: quantum/openstack/common/rpc/matchmaker.py:47
 msgid "Match not found by MatchMaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:89
+#: quantum/openstack/common/rpc/matchmaker.py:83
 msgid "Matchmaker does not implement registration or heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:239
+#: quantum/openstack/common/rpc/matchmaker.py:233
 #, python-format
-msgid "Matchmaker unregistered: %s, %s"
+msgid "Matchmaker unregistered: %(key)s, %(host)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:250
+#: quantum/openstack/common/rpc/matchmaker.py:245
 msgid "Register before starting heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:343
-#: quantum/openstack/common/rpc/matchmaker.py:361
+#: quantum/openstack/common/rpc/matchmaker_ring.py:81
+#: quantum/openstack/common/rpc/matchmaker_ring.py:99
 #, python-format
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
@@ -5124,7 +5148,7 @@ msgstr ""
 #: quantum/plugins/midonet/midonet_lib.py:278
 #, python-format
 msgid ""
-"RuleManager.create_for_sg_rule: adding accept rule %(rule_id) in "
+"RuleManager.create_for_sg_rule: adding accept rule %(rule_id)s in "
 "portgroup %(port_group_id)s"
 msgstr ""
 
@@ -5222,7 +5246,7 @@ msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
 #: quantum/plugins/midonet/plugin.py:319
-#: quantum/plugins/nicira/QuantumPlugin.py:1025
+#: quantum/plugins/nicira/QuantumPlugin.py:1030
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
@@ -6089,408 +6113,408 @@ msgstr ""
 msgid "The request has timed out."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:223
+#: quantum/plugins/nicira/QuantumPlugin.py:228
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:258
+#: quantum/plugins/nicira/QuantumPlugin.py:263
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:260
+#: quantum/plugins/nicira/QuantumPlugin.py:265
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:263
+#: quantum/plugins/nicira/QuantumPlugin.py:268
 #, python-format
 msgid ""
 "Unable to create logical router port for quantum port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:285
+#: quantum/plugins/nicira/QuantumPlugin.py:290
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:291
+#: quantum/plugins/nicira/QuantumPlugin.py:296
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
 "associated with Quantum %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:297
+#: quantum/plugins/nicira/QuantumPlugin.py:302
 #, python-format
 msgid ""
 "Unable to plug attachment in router port %(r_port_id)s for quantum port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:342
+#: quantum/plugins/nicira/QuantumPlugin.py:347
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:367
-#: quantum/plugins/nicira/QuantumPlugin.py:402
-#: quantum/plugins/nicira/QuantumPlugin.py:592
+#: quantum/plugins/nicira/QuantumPlugin.py:372
+#: quantum/plugins/nicira/QuantumPlugin.py:407
+#: quantum/plugins/nicira/QuantumPlugin.py:597
 #, python-format
 msgid ""
 "NVP plugin does not support regular VIF ports on external networks. Port "
 "%s will be down."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:387
-#: quantum/plugins/nicira/QuantumPlugin.py:468
-#: quantum/plugins/nicira/QuantumPlugin.py:612
+#: quantum/plugins/nicira/QuantumPlugin.py:392
+#: quantum/plugins/nicira/QuantumPlugin.py:473
+#: quantum/plugins/nicira/QuantumPlugin.py:617
 #, python-format
 msgid ""
 "_nvp_create_port completed for port %(name)s on network %(network_id)s. "
 "The new port id is %(id)s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:391
+#: quantum/plugins/nicira/QuantumPlugin.py:396
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:409
+#: quantum/plugins/nicira/QuantumPlugin.py:414
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:418
+#: quantum/plugins/nicira/QuantumPlugin.py:423
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:424
+#: quantum/plugins/nicira/QuantumPlugin.py:429
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:443
-#: quantum/plugins/nicira/QuantumPlugin.py:876
+#: quantum/plugins/nicira/QuantumPlugin.py:448
+#: quantum/plugins/nicira/QuantumPlugin.py:881
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:455
+#: quantum/plugins/nicira/QuantumPlugin.py:460
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:473
+#: quantum/plugins/nicira/QuantumPlugin.py:478
 msgid "An exception occured while plugging the interface"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:481
+#: quantum/plugins/nicira/QuantumPlugin.py:486
 #, python-format
 msgid ""
 "device_id field must be populated in order to create an external gateway "
 "port for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:489
+#: quantum/plugins/nicira/QuantumPlugin.py:494
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:535
+#: quantum/plugins/nicira/QuantumPlugin.py:540
 #, python-format
 msgid ""
 "_nvp_create_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s. NVP port id is %(nvp_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:573
+#: quantum/plugins/nicira/QuantumPlugin.py:578
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:577
-#: quantum/plugins/nicira/QuantumPlugin.py:1718
+#: quantum/plugins/nicira/QuantumPlugin.py:582
+#: quantum/plugins/nicira/QuantumPlugin.py:1723
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:579
+#: quantum/plugins/nicira/QuantumPlugin.py:584
 #, python-format
 msgid ""
 "_nvp_delete_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:617
+#: quantum/plugins/nicira/QuantumPlugin.py:622
 #, python-format
 msgid "An exception occured while plugging the gateway interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:657
+#: quantum/plugins/nicira/QuantumPlugin.py:662
 #, python-format
 msgid "Unable to find NVP uuid for Quantum port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:686
+#: quantum/plugins/nicira/QuantumPlugin.py:691
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:690
+#: quantum/plugins/nicira/QuantumPlugin.py:695
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:694
+#: quantum/plugins/nicira/QuantumPlugin.py:699
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:698
-#: quantum/plugins/nicira/QuantumPlugin.py:713
+#: quantum/plugins/nicira/QuantumPlugin.py:703
+#: quantum/plugins/nicira/QuantumPlugin.py:718
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:719
+#: quantum/plugins/nicira/QuantumPlugin.py:724
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:750
+#: quantum/plugins/nicira/QuantumPlugin.py:755
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:772
+#: quantum/plugins/nicira/QuantumPlugin.py:777
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:799
+#: quantum/plugins/nicira/QuantumPlugin.py:804
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not yet supported by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:858
+#: quantum/plugins/nicira/QuantumPlugin.py:863
 #, python-format
 msgid "A nvp lport identifier was not found for quantum port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:886
+#: quantum/plugins/nicira/QuantumPlugin.py:891
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:889
+#: quantum/plugins/nicira/QuantumPlugin.py:894
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:915
+#: quantum/plugins/nicira/QuantumPlugin.py:920
 #, python-format
 msgid ""
 "Current network status:%(nvp_net_status)s; Status in Quantum "
 "DB:%(quantum_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:925
-#: quantum/plugins/nicira/QuantumPlugin.py:975
+#: quantum/plugins/nicira/QuantumPlugin.py:930
+#: quantum/plugins/nicira/QuantumPlugin.py:980
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:989
+#: quantum/plugins/nicira/QuantumPlugin.py:994
 #, python-format
 msgid "Logical Switch %s found in quantum database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1004
+#: quantum/plugins/nicira/QuantumPlugin.py:1009
 #, python-format
 msgid ""
 "Found %s logical switches not bound to Quantum networks. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1008
+#: quantum/plugins/nicira/QuantumPlugin.py:1013
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1091
+#: quantum/plugins/nicira/QuantumPlugin.py:1096
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1100
+#: quantum/plugins/nicira/QuantumPlugin.py:1105
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1127
+#: quantum/plugins/nicira/QuantumPlugin.py:1132
 #, python-format
 msgid "Quantum logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1134
+#: quantum/plugins/nicira/QuantumPlugin.py:1139
 #, python-format
 msgid ""
 "Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1196
+#: quantum/plugins/nicira/QuantumPlugin.py:1201
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1202
+#: quantum/plugins/nicira/QuantumPlugin.py:1207
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1207
+#: quantum/plugins/nicira/QuantumPlugin.py:1212
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1271
+#: quantum/plugins/nicira/QuantumPlugin.py:1276
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1296
+#: quantum/plugins/nicira/QuantumPlugin.py:1301
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1410
-#: quantum/plugins/nicira/QuantumPlugin.py:1455
+#: quantum/plugins/nicira/QuantumPlugin.py:1415
+#: quantum/plugins/nicira/QuantumPlugin.py:1460
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1423
+#: quantum/plugins/nicira/QuantumPlugin.py:1428
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1465
+#: quantum/plugins/nicira/QuantumPlugin.py:1470
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1468
+#: quantum/plugins/nicira/QuantumPlugin.py:1473
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1488
+#: quantum/plugins/nicira/QuantumPlugin.py:1493
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1492
+#: quantum/plugins/nicira/QuantumPlugin.py:1497
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1513
+#: quantum/plugins/nicira/QuantumPlugin.py:1518
 #, python-format
 msgid ""
 "Current router status:%(router_status)s;Status in Quantum "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1521
+#: quantum/plugins/nicira/QuantumPlugin.py:1526
 msgid "Unable to get logical router"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1544
+#: quantum/plugins/nicira/QuantumPlugin.py:1549
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1566
+#: quantum/plugins/nicira/QuantumPlugin.py:1571
 #, python-format
 msgid ""
 "Found %s logical routers not bound to Quantum routers. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1593
+#: quantum/plugins/nicira/QuantumPlugin.py:1598
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1628
+#: quantum/plugins/nicira/QuantumPlugin.py:1633
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1673
+#: quantum/plugins/nicira/QuantumPlugin.py:1678
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1685
+#: quantum/plugins/nicira/QuantumPlugin.py:1690
 #, python-format
 msgid ""
 "Unable to find NVP logical router port for Quantum port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1714
+#: quantum/plugins/nicira/QuantumPlugin.py:1719
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1740
+#: quantum/plugins/nicira/QuantumPlugin.py:1745
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1746
+#: quantum/plugins/nicira/QuantumPlugin.py:1751
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1812
+#: quantum/plugins/nicira/QuantumPlugin.py:1817
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1836
+#: quantum/plugins/nicira/QuantumPlugin.py:1841
 #, python-format
 msgid ""
 "An error occurred while creating NAT rules on the NVP platform for "
 "floating ip:%(floating_ip)s mapped to internal ip:%(internal_ip)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1878
+#: quantum/plugins/nicira/QuantumPlugin.py:1883
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1881
+#: quantum/plugins/nicira/QuantumPlugin.py:1886
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1907
+#: quantum/plugins/nicira/QuantumPlugin.py:1912
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1929
+#: quantum/plugins/nicira/QuantumPlugin.py:1934
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
@@ -6536,69 +6560,69 @@ msgstr ""
 msgid "The network gateway %(gateway_id)s cannot be updated or deleted"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:152
+#: quantum/plugins/nicira/nicira_networkgw_db.py:160
 msgid ""
 "A network identifier must be specified when connecting a network to a "
 "network gateway. Unable to complete operation"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:158
+#: quantum/plugins/nicira/nicira_networkgw_db.py:166
 #, python-format
 msgid ""
 "Invalid keys found among the ones provided in request body: "
 "%(connection_attrs)s."
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:164
+#: quantum/plugins/nicira/nicira_networkgw_db.py:172
 msgid ""
 "In order to specify a segmentation id the segmentation type must be "
 "specified as well"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:168
+#: quantum/plugins/nicira/nicira_networkgw_db.py:176
 msgid "Cannot specify a segmentation id when the segmentation type is flat"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:217
+#: quantum/plugins/nicira/nicira_networkgw_db.py:225
 #, python-format
 msgid "Created network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:230
+#: quantum/plugins/nicira/nicira_networkgw_db.py:237
 #, python-format
 msgid "Updated network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:245
+#: quantum/plugins/nicira/nicira_networkgw_db.py:252
 #, python-format
 msgid "Network gateway '%s' was destroyed."
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:255
+#: quantum/plugins/nicira/nicira_networkgw_db.py:262
 #, python-format
 msgid "Connecting network '%(network_id)s' to gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:296
+#: quantum/plugins/nicira/nicira_networkgw_db.py:303
 #, python-format
 msgid ""
 "Requested network '%(network_id)s' not found.Unable to create network "
 "connection on gateway '%(network_gateway_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:304
+#: quantum/plugins/nicira/nicira_networkgw_db.py:311
 #, python-format
 msgid ""
 "Gateway port for '%(network_gateway_id)s' created on network "
 "'%(network_id)s':%(port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:320
+#: quantum/plugins/nicira/nicira_networkgw_db.py:327
 #, python-format
 msgid "Ensured no Ip addresses are configured on port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:330
+#: quantum/plugins/nicira/nicira_networkgw_db.py:337
 #, python-format
 msgid ""
 "Disconnecting network '%(network_id)s' from gateway "
@@ -7229,11 +7253,11 @@ msgid ""
 "router:'%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:63
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:66
 msgid "Cannot create a gateway with an empty device list"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:89
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:92
 msgid "number of network gateways allowed per tenant, -1 for unlimited"
 msgstr ""
 
@@ -7970,3 +7994,14 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
+#~ msgid "no calling threads waiting for msg_id : %s, message : %s"
+#~ msgstr ""
+
+#~ msgid "Matchmaker unregistered: %s, %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "RuleManager.create_for_sg_rule: adding accept rule"
+#~ " %(rule_id) in portgroup %(port_group_id)s"
+#~ msgstr ""
+

diff --git a/quantum/locale/it/LC_MESSAGES/quantum.po b/quantum/locale/it/LC_MESSAGES/quantum.po
index 32946ab12f686f87b321886f9156f5e2d7a20ddd..2f25e28af20b6f9b4892c83a093ca83236909801 100644 (file)
--- a/quantum/locale/it/LC_MESSAGES/quantum.po
+++ b/quantum/locale/it/LC_MESSAGES/quantum.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-05-26 12:11+0000\n"
+"POT-Creation-Date: 2013-05-27 12:11+0000\n"
 "PO-Revision-Date: 2013-05-16 09:23+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Italian "
@@ -2235,7 +2235,7 @@ msgid ""
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:594 quantum/plugins/nicira/QuantumPlugin.py:1773
+#: quantum/db/l3_db.py:594 quantum/plugins/nicira/QuantumPlugin.py:1778
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
@@ -2808,7 +2808,7 @@ msgid "Was expecting a dict for service definition, found the following: %s"
 msgstr ""
 
 #: quantum/extensions/servicetype.py:160
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:83
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:86
 #, python-format
 msgid "%s: provided data are not iterable"
 msgstr ""
@@ -2832,47 +2832,47 @@ msgstr ""
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:98
+#: quantum/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:184
+#: quantum/openstack/common/lockutils.py:188
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:195
+#: quantum/openstack/common/lockutils.py:199
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:222
+#: quantum/openstack/common/lockutils.py:226
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:230
+#: quantum/openstack/common/lockutils.py:234
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/log.py:226
+#: quantum/openstack/common/log.py:244
 #, python-format
 msgid "Deprecated: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:329
+#: quantum/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:379
+#: quantum/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:537
+#: quantum/openstack/common/log.py:555
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2895,120 +2895,134 @@ msgstr ""
 msgid "in dynamic looping call"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:41
+#: quantum/openstack/common/periodic_task.py:42
 #, python-format
 msgid "Unexpected argument for periodic task creation: %(arg)s."
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:132
+#: quantum/openstack/common/periodic_task.py:133
 #, python-format
 msgid "Skipping periodic task %(task)s because its interval is negative"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:137
+#: quantum/openstack/common/periodic_task.py:138
 #, python-format
 msgid "Skipping periodic task %(task)s because it is disabled"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:175
+#: quantum/openstack/common/periodic_task.py:176
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:183
+#: quantum/openstack/common/periodic_task.py:184
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:394
+#: quantum/openstack/common/policy.py:395
 #, python-format
 msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:404
+#: quantum/openstack/common/policy.py:405
 #, python-format
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:679
+#: quantum/openstack/common/policy.py:680
 #, python-format
 msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:122
+#: quantum/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:137
+#: quantum/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:162
+#: quantum/openstack/common/processutils.py:167
+#: quantum/openstack/common/processutils.py:240
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:174
+#: quantum/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: quantum/openstack/common/service.py:112
-#: quantum/openstack/common/service.py:275
+#: quantum/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
+#: quantum/openstack/common/processutils.py:221
+msgid "Environment not supported over SSH"
+msgstr ""
+
+#: quantum/openstack/common/processutils.py:225
+msgid "process_input not supported over SSH"
+msgstr ""
+
+#: quantum/openstack/common/service.py:113
+#: quantum/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: quantum/openstack/common/service.py:121
-#: quantum/openstack/common/service.py:218
+#: quantum/openstack/common/service.py:122
+#: quantum/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:164
+#: quantum/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:200
+#: quantum/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: quantum/openstack/common/service.py:223
+#: quantum/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: quantum/openstack/common/service.py:230
+#: quantum/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:240
+#: quantum/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: quantum/openstack/common/service.py:257
+#: quantum/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:261
+#: quantum/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:265
+#: quantum/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
 
-#: quantum/openstack/common/service.py:293
+#: quantum/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: quantum/openstack/common/service.py:304
+#: quantum/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -3054,131 +3068,136 @@ msgstr ""
 
 #: quantum/openstack/common/rpc/amqp.py:200
 #, python-format
-msgid "no calling threads waiting for msg_id : %s, message : %s"
+msgid "no calling threads waiting for msg_id : %(msg_id)s, message : %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:208
+#: quantum/openstack/common/rpc/amqp.py:209
 #, python-format
 msgid ""
 "Number of call waiters is greater than warning threshhold: %d. There "
 "could be a MulticallProxyWaiter leak."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:291
+#: quantum/openstack/common/rpc/amqp.py:292
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:337
+#: quantum/openstack/common/rpc/amqp.py:338
 #, python-format
 msgid "UNIQUE_ID is %s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:406
+#: quantum/openstack/common/rpc/amqp.py:407
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:414
+#: quantum/openstack/common/rpc/amqp.py:415
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:415
+#: quantum/openstack/common/rpc/amqp.py:416
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:443
+#: quantum/openstack/common/rpc/amqp.py:444
 #: quantum/openstack/common/rpc/impl_zmq.py:286
 #, python-format
 msgid "Expected exception during message handling (%s)"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:451
+#: quantum/openstack/common/rpc/amqp.py:452
 #: quantum/openstack/common/rpc/impl_zmq.py:292
 msgid "Exception during message handling"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:586
+#: quantum/openstack/common/rpc/amqp.py:587
 #, python-format
 msgid "Making synchronous call on %s ..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:589
+#: quantum/openstack/common/rpc/amqp.py:590
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:623
+#: quantum/openstack/common/rpc/amqp.py:624
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:632
+#: quantum/openstack/common/rpc/amqp.py:633
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:660
+#: quantum/openstack/common/rpc/amqp.py:661
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:74
+#: quantum/openstack/common/rpc/common.py:75
 msgid "An unknown RPC related exception occurred."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:86
+#: quantum/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:104
+#: quantum/openstack/common/rpc/common.py:105
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:121
+#: quantum/openstack/common/rpc/common.py:122
 #, python-format
 msgid ""
 "Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:"
 " \"%(method)s\" info: \"%(info)s\""
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:137
 #: quantum/openstack/common/rpc/common.py:138
 #: quantum/openstack/common/rpc/common.py:139
+#: quantum/openstack/common/rpc/common.py:140
 msgid "<unknown>"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:143
+#: quantum/openstack/common/rpc/common.py:144
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:147
+#: quantum/openstack/common/rpc/common.py:148
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:151
+#: quantum/openstack/common/rpc/common.py:152
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:156
+#: quantum/openstack/common/rpc/common.py:157
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:280
+#: quantum/openstack/common/rpc/common.py:162
+#, python-format
+msgid "Specified RPC version cap, %(version_cap)s, is too low"
+msgstr ""
+
+#: quantum/openstack/common/rpc/common.py:285
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:302
+#: quantum/openstack/common/rpc/common.py:307
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
@@ -3441,25 +3460,30 @@ msgstr ""
 msgid "No match from matchmaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:53
+#: quantum/openstack/common/rpc/impl_zmq.py:852
+#, python-format
+msgid "rpc_zmq_matchmaker = %(orig)s is deprecated; use %(new)s instead"
+msgstr ""
+
+#: quantum/openstack/common/rpc/matchmaker.py:47
 msgid "Match not found by MatchMaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:89
+#: quantum/openstack/common/rpc/matchmaker.py:83
 msgid "Matchmaker does not implement registration or heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:239
+#: quantum/openstack/common/rpc/matchmaker.py:233
 #, python-format
-msgid "Matchmaker unregistered: %s, %s"
+msgid "Matchmaker unregistered: %(key)s, %(host)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:250
+#: quantum/openstack/common/rpc/matchmaker.py:245
 msgid "Register before starting heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:343
-#: quantum/openstack/common/rpc/matchmaker.py:361
+#: quantum/openstack/common/rpc/matchmaker_ring.py:81
+#: quantum/openstack/common/rpc/matchmaker_ring.py:99
 #, python-format
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
@@ -5124,7 +5148,7 @@ msgstr ""
 #: quantum/plugins/midonet/midonet_lib.py:278
 #, python-format
 msgid ""
-"RuleManager.create_for_sg_rule: adding accept rule %(rule_id) in "
+"RuleManager.create_for_sg_rule: adding accept rule %(rule_id)s in "
 "portgroup %(port_group_id)s"
 msgstr ""
 
@@ -5222,7 +5246,7 @@ msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
 #: quantum/plugins/midonet/plugin.py:319
-#: quantum/plugins/nicira/QuantumPlugin.py:1025
+#: quantum/plugins/nicira/QuantumPlugin.py:1030
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
@@ -6089,408 +6113,408 @@ msgstr ""
 msgid "The request has timed out."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:223
+#: quantum/plugins/nicira/QuantumPlugin.py:228
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:258
+#: quantum/plugins/nicira/QuantumPlugin.py:263
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:260
+#: quantum/plugins/nicira/QuantumPlugin.py:265
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:263
+#: quantum/plugins/nicira/QuantumPlugin.py:268
 #, python-format
 msgid ""
 "Unable to create logical router port for quantum port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:285
+#: quantum/plugins/nicira/QuantumPlugin.py:290
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:291
+#: quantum/plugins/nicira/QuantumPlugin.py:296
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
 "associated with Quantum %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:297
+#: quantum/plugins/nicira/QuantumPlugin.py:302
 #, python-format
 msgid ""
 "Unable to plug attachment in router port %(r_port_id)s for quantum port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:342
+#: quantum/plugins/nicira/QuantumPlugin.py:347
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:367
-#: quantum/plugins/nicira/QuantumPlugin.py:402
-#: quantum/plugins/nicira/QuantumPlugin.py:592
+#: quantum/plugins/nicira/QuantumPlugin.py:372
+#: quantum/plugins/nicira/QuantumPlugin.py:407
+#: quantum/plugins/nicira/QuantumPlugin.py:597
 #, python-format
 msgid ""
 "NVP plugin does not support regular VIF ports on external networks. Port "
 "%s will be down."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:387
-#: quantum/plugins/nicira/QuantumPlugin.py:468
-#: quantum/plugins/nicira/QuantumPlugin.py:612
+#: quantum/plugins/nicira/QuantumPlugin.py:392
+#: quantum/plugins/nicira/QuantumPlugin.py:473
+#: quantum/plugins/nicira/QuantumPlugin.py:617
 #, python-format
 msgid ""
 "_nvp_create_port completed for port %(name)s on network %(network_id)s. "
 "The new port id is %(id)s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:391
+#: quantum/plugins/nicira/QuantumPlugin.py:396
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:409
+#: quantum/plugins/nicira/QuantumPlugin.py:414
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:418
+#: quantum/plugins/nicira/QuantumPlugin.py:423
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:424
+#: quantum/plugins/nicira/QuantumPlugin.py:429
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:443
-#: quantum/plugins/nicira/QuantumPlugin.py:876
+#: quantum/plugins/nicira/QuantumPlugin.py:448
+#: quantum/plugins/nicira/QuantumPlugin.py:881
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:455
+#: quantum/plugins/nicira/QuantumPlugin.py:460
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:473
+#: quantum/plugins/nicira/QuantumPlugin.py:478
 msgid "An exception occured while plugging the interface"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:481
+#: quantum/plugins/nicira/QuantumPlugin.py:486
 #, python-format
 msgid ""
 "device_id field must be populated in order to create an external gateway "
 "port for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:489
+#: quantum/plugins/nicira/QuantumPlugin.py:494
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:535
+#: quantum/plugins/nicira/QuantumPlugin.py:540
 #, python-format
 msgid ""
 "_nvp_create_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s. NVP port id is %(nvp_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:573
+#: quantum/plugins/nicira/QuantumPlugin.py:578
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:577
-#: quantum/plugins/nicira/QuantumPlugin.py:1718
+#: quantum/plugins/nicira/QuantumPlugin.py:582
+#: quantum/plugins/nicira/QuantumPlugin.py:1723
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:579
+#: quantum/plugins/nicira/QuantumPlugin.py:584
 #, python-format
 msgid ""
 "_nvp_delete_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:617
+#: quantum/plugins/nicira/QuantumPlugin.py:622
 #, python-format
 msgid "An exception occured while plugging the gateway interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:657
+#: quantum/plugins/nicira/QuantumPlugin.py:662
 #, python-format
 msgid "Unable to find NVP uuid for Quantum port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:686
+#: quantum/plugins/nicira/QuantumPlugin.py:691
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:690
+#: quantum/plugins/nicira/QuantumPlugin.py:695
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:694
+#: quantum/plugins/nicira/QuantumPlugin.py:699
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:698
-#: quantum/plugins/nicira/QuantumPlugin.py:713
+#: quantum/plugins/nicira/QuantumPlugin.py:703
+#: quantum/plugins/nicira/QuantumPlugin.py:718
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:719
+#: quantum/plugins/nicira/QuantumPlugin.py:724
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:750
+#: quantum/plugins/nicira/QuantumPlugin.py:755
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:772
+#: quantum/plugins/nicira/QuantumPlugin.py:777
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:799
+#: quantum/plugins/nicira/QuantumPlugin.py:804
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not yet supported by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:858
+#: quantum/plugins/nicira/QuantumPlugin.py:863
 #, python-format
 msgid "A nvp lport identifier was not found for quantum port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:886
+#: quantum/plugins/nicira/QuantumPlugin.py:891
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:889
+#: quantum/plugins/nicira/QuantumPlugin.py:894
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:915
+#: quantum/plugins/nicira/QuantumPlugin.py:920
 #, python-format
 msgid ""
 "Current network status:%(nvp_net_status)s; Status in Quantum "
 "DB:%(quantum_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:925
-#: quantum/plugins/nicira/QuantumPlugin.py:975
+#: quantum/plugins/nicira/QuantumPlugin.py:930
+#: quantum/plugins/nicira/QuantumPlugin.py:980
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:989
+#: quantum/plugins/nicira/QuantumPlugin.py:994
 #, python-format
 msgid "Logical Switch %s found in quantum database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1004
+#: quantum/plugins/nicira/QuantumPlugin.py:1009
 #, python-format
 msgid ""
 "Found %s logical switches not bound to Quantum networks. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1008
+#: quantum/plugins/nicira/QuantumPlugin.py:1013
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1091
+#: quantum/plugins/nicira/QuantumPlugin.py:1096
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1100
+#: quantum/plugins/nicira/QuantumPlugin.py:1105
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1127
+#: quantum/plugins/nicira/QuantumPlugin.py:1132
 #, python-format
 msgid "Quantum logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1134
+#: quantum/plugins/nicira/QuantumPlugin.py:1139
 #, python-format
 msgid ""
 "Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1196
+#: quantum/plugins/nicira/QuantumPlugin.py:1201
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1202
+#: quantum/plugins/nicira/QuantumPlugin.py:1207
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1207
+#: quantum/plugins/nicira/QuantumPlugin.py:1212
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1271
+#: quantum/plugins/nicira/QuantumPlugin.py:1276
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1296
+#: quantum/plugins/nicira/QuantumPlugin.py:1301
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1410
-#: quantum/plugins/nicira/QuantumPlugin.py:1455
+#: quantum/plugins/nicira/QuantumPlugin.py:1415
+#: quantum/plugins/nicira/QuantumPlugin.py:1460
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1423
+#: quantum/plugins/nicira/QuantumPlugin.py:1428
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1465
+#: quantum/plugins/nicira/QuantumPlugin.py:1470
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1468
+#: quantum/plugins/nicira/QuantumPlugin.py:1473
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1488
+#: quantum/plugins/nicira/QuantumPlugin.py:1493
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1492
+#: quantum/plugins/nicira/QuantumPlugin.py:1497
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1513
+#: quantum/plugins/nicira/QuantumPlugin.py:1518
 #, python-format
 msgid ""
 "Current router status:%(router_status)s;Status in Quantum "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1521
+#: quantum/plugins/nicira/QuantumPlugin.py:1526
 msgid "Unable to get logical router"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1544
+#: quantum/plugins/nicira/QuantumPlugin.py:1549
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1566
+#: quantum/plugins/nicira/QuantumPlugin.py:1571
 #, python-format
 msgid ""
 "Found %s logical routers not bound to Quantum routers. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1593
+#: quantum/plugins/nicira/QuantumPlugin.py:1598
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1628
+#: quantum/plugins/nicira/QuantumPlugin.py:1633
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1673
+#: quantum/plugins/nicira/QuantumPlugin.py:1678
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1685
+#: quantum/plugins/nicira/QuantumPlugin.py:1690
 #, python-format
 msgid ""
 "Unable to find NVP logical router port for Quantum port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1714
+#: quantum/plugins/nicira/QuantumPlugin.py:1719
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1740
+#: quantum/plugins/nicira/QuantumPlugin.py:1745
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1746
+#: quantum/plugins/nicira/QuantumPlugin.py:1751
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1812
+#: quantum/plugins/nicira/QuantumPlugin.py:1817
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1836
+#: quantum/plugins/nicira/QuantumPlugin.py:1841
 #, python-format
 msgid ""
 "An error occurred while creating NAT rules on the NVP platform for "
 "floating ip:%(floating_ip)s mapped to internal ip:%(internal_ip)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1878
+#: quantum/plugins/nicira/QuantumPlugin.py:1883
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1881
+#: quantum/plugins/nicira/QuantumPlugin.py:1886
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1907
+#: quantum/plugins/nicira/QuantumPlugin.py:1912
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1929
+#: quantum/plugins/nicira/QuantumPlugin.py:1934
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
@@ -6536,69 +6560,69 @@ msgstr ""
 msgid "The network gateway %(gateway_id)s cannot be updated or deleted"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:152
+#: quantum/plugins/nicira/nicira_networkgw_db.py:160
 msgid ""
 "A network identifier must be specified when connecting a network to a "
 "network gateway. Unable to complete operation"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:158
+#: quantum/plugins/nicira/nicira_networkgw_db.py:166
 #, python-format
 msgid ""
 "Invalid keys found among the ones provided in request body: "
 "%(connection_attrs)s."
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:164
+#: quantum/plugins/nicira/nicira_networkgw_db.py:172
 msgid ""
 "In order to specify a segmentation id the segmentation type must be "
 "specified as well"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:168
+#: quantum/plugins/nicira/nicira_networkgw_db.py:176
 msgid "Cannot specify a segmentation id when the segmentation type is flat"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:217
+#: quantum/plugins/nicira/nicira_networkgw_db.py:225
 #, python-format
 msgid "Created network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:230
+#: quantum/plugins/nicira/nicira_networkgw_db.py:237
 #, python-format
 msgid "Updated network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:245
+#: quantum/plugins/nicira/nicira_networkgw_db.py:252
 #, python-format
 msgid "Network gateway '%s' was destroyed."
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:255
+#: quantum/plugins/nicira/nicira_networkgw_db.py:262
 #, python-format
 msgid "Connecting network '%(network_id)s' to gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:296
+#: quantum/plugins/nicira/nicira_networkgw_db.py:303
 #, python-format
 msgid ""
 "Requested network '%(network_id)s' not found.Unable to create network "
 "connection on gateway '%(network_gateway_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:304
+#: quantum/plugins/nicira/nicira_networkgw_db.py:311
 #, python-format
 msgid ""
 "Gateway port for '%(network_gateway_id)s' created on network "
 "'%(network_id)s':%(port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:320
+#: quantum/plugins/nicira/nicira_networkgw_db.py:327
 #, python-format
 msgid "Ensured no Ip addresses are configured on port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:330
+#: quantum/plugins/nicira/nicira_networkgw_db.py:337
 #, python-format
 msgid ""
 "Disconnecting network '%(network_id)s' from gateway "
@@ -7229,11 +7253,11 @@ msgid ""
 "router:'%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:63
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:66
 msgid "Cannot create a gateway with an empty device list"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:89
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:92
 msgid "number of network gateways allowed per tenant, -1 for unlimited"
 msgstr ""
 
@@ -7970,3 +7994,14 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
+#~ msgid "no calling threads waiting for msg_id : %s, message : %s"
+#~ msgstr ""
+
+#~ msgid "Matchmaker unregistered: %s, %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "RuleManager.create_for_sg_rule: adding accept rule"
+#~ " %(rule_id) in portgroup %(port_group_id)s"
+#~ msgstr ""
+

diff --git a/quantum/locale/ja/LC_MESSAGES/quantum.po b/quantum/locale/ja/LC_MESSAGES/quantum.po
index 5c630787b365ef69c8f834bbe8e925ce75bfe5ba..ee00d612c9407c6bf780ddfdc877bb9edc63d9f9 100644 (file)
--- a/quantum/locale/ja/LC_MESSAGES/quantum.po
+++ b/quantum/locale/ja/LC_MESSAGES/quantum.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-05-26 12:11+0000\n"
+"POT-Creation-Date: 2013-05-27 12:11+0000\n"
 "PO-Revision-Date: 2013-01-30 10:28+0000\n"
 "Last-Translator: Tomoyuki KATO <tomo@dream.daynight.jp>\n"
 "Language-Team: Japanese "
@@ -2236,7 +2236,7 @@ msgid ""
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:594 quantum/plugins/nicira/QuantumPlugin.py:1773
+#: quantum/db/l3_db.py:594 quantum/plugins/nicira/QuantumPlugin.py:1778
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
@@ -2809,7 +2809,7 @@ msgid "Was expecting a dict for service definition, found the following: %s"
 msgstr ""
 
 #: quantum/extensions/servicetype.py:160
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:83
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:86
 #, python-format
 msgid "%s: provided data are not iterable"
 msgstr ""
@@ -2833,47 +2833,47 @@ msgstr ""
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:98
+#: quantum/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:184
+#: quantum/openstack/common/lockutils.py:188
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:195
+#: quantum/openstack/common/lockutils.py:199
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:222
+#: quantum/openstack/common/lockutils.py:226
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:230
+#: quantum/openstack/common/lockutils.py:234
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/log.py:226
+#: quantum/openstack/common/log.py:244
 #, python-format
 msgid "Deprecated: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:329
+#: quantum/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:379
+#: quantum/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:537
+#: quantum/openstack/common/log.py:555
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2896,120 +2896,134 @@ msgstr ""
 msgid "in dynamic looping call"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:41
+#: quantum/openstack/common/periodic_task.py:42
 #, python-format
 msgid "Unexpected argument for periodic task creation: %(arg)s."
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:132
+#: quantum/openstack/common/periodic_task.py:133
 #, python-format
 msgid "Skipping periodic task %(task)s because its interval is negative"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:137
+#: quantum/openstack/common/periodic_task.py:138
 #, python-format
 msgid "Skipping periodic task %(task)s because it is disabled"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:175
+#: quantum/openstack/common/periodic_task.py:176
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:183
+#: quantum/openstack/common/periodic_task.py:184
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:394
+#: quantum/openstack/common/policy.py:395
 #, python-format
 msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:404
+#: quantum/openstack/common/policy.py:405
 #, python-format
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:679
+#: quantum/openstack/common/policy.py:680
 #, python-format
 msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:122
+#: quantum/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:137
+#: quantum/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:162
+#: quantum/openstack/common/processutils.py:167
+#: quantum/openstack/common/processutils.py:240
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:174
+#: quantum/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: quantum/openstack/common/service.py:112
-#: quantum/openstack/common/service.py:275
+#: quantum/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
+#: quantum/openstack/common/processutils.py:221
+msgid "Environment not supported over SSH"
+msgstr ""
+
+#: quantum/openstack/common/processutils.py:225
+msgid "process_input not supported over SSH"
+msgstr ""
+
+#: quantum/openstack/common/service.py:113
+#: quantum/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: quantum/openstack/common/service.py:121
-#: quantum/openstack/common/service.py:218
+#: quantum/openstack/common/service.py:122
+#: quantum/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:164
+#: quantum/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:200
+#: quantum/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: quantum/openstack/common/service.py:223
+#: quantum/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: quantum/openstack/common/service.py:230
+#: quantum/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:240
+#: quantum/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: quantum/openstack/common/service.py:257
+#: quantum/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:261
+#: quantum/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:265
+#: quantum/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
 
-#: quantum/openstack/common/service.py:293
+#: quantum/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: quantum/openstack/common/service.py:304
+#: quantum/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -3055,131 +3069,136 @@ msgstr ""
 
 #: quantum/openstack/common/rpc/amqp.py:200
 #, python-format
-msgid "no calling threads waiting for msg_id : %s, message : %s"
+msgid "no calling threads waiting for msg_id : %(msg_id)s, message : %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:208
+#: quantum/openstack/common/rpc/amqp.py:209
 #, python-format
 msgid ""
 "Number of call waiters is greater than warning threshhold: %d. There "
 "could be a MulticallProxyWaiter leak."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:291
+#: quantum/openstack/common/rpc/amqp.py:292
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:337
+#: quantum/openstack/common/rpc/amqp.py:338
 #, python-format
 msgid "UNIQUE_ID is %s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:406
+#: quantum/openstack/common/rpc/amqp.py:407
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:414
+#: quantum/openstack/common/rpc/amqp.py:415
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:415
+#: quantum/openstack/common/rpc/amqp.py:416
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:443
+#: quantum/openstack/common/rpc/amqp.py:444
 #: quantum/openstack/common/rpc/impl_zmq.py:286
 #, python-format
 msgid "Expected exception during message handling (%s)"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:451
+#: quantum/openstack/common/rpc/amqp.py:452
 #: quantum/openstack/common/rpc/impl_zmq.py:292
 msgid "Exception during message handling"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:586
+#: quantum/openstack/common/rpc/amqp.py:587
 #, python-format
 msgid "Making synchronous call on %s ..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:589
+#: quantum/openstack/common/rpc/amqp.py:590
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:623
+#: quantum/openstack/common/rpc/amqp.py:624
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:632
+#: quantum/openstack/common/rpc/amqp.py:633
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:660
+#: quantum/openstack/common/rpc/amqp.py:661
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:74
+#: quantum/openstack/common/rpc/common.py:75
 msgid "An unknown RPC related exception occurred."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:86
+#: quantum/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:104
+#: quantum/openstack/common/rpc/common.py:105
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:121
+#: quantum/openstack/common/rpc/common.py:122
 #, python-format
 msgid ""
 "Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:"
 " \"%(method)s\" info: \"%(info)s\""
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:137
 #: quantum/openstack/common/rpc/common.py:138
 #: quantum/openstack/common/rpc/common.py:139
+#: quantum/openstack/common/rpc/common.py:140
 msgid "<unknown>"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:143
+#: quantum/openstack/common/rpc/common.py:144
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:147
+#: quantum/openstack/common/rpc/common.py:148
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:151
+#: quantum/openstack/common/rpc/common.py:152
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:156
+#: quantum/openstack/common/rpc/common.py:157
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:280
+#: quantum/openstack/common/rpc/common.py:162
+#, python-format
+msgid "Specified RPC version cap, %(version_cap)s, is too low"
+msgstr ""
+
+#: quantum/openstack/common/rpc/common.py:285
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:302
+#: quantum/openstack/common/rpc/common.py:307
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
@@ -3442,25 +3461,30 @@ msgstr ""
 msgid "No match from matchmaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:53
+#: quantum/openstack/common/rpc/impl_zmq.py:852
+#, python-format
+msgid "rpc_zmq_matchmaker = %(orig)s is deprecated; use %(new)s instead"
+msgstr ""
+
+#: quantum/openstack/common/rpc/matchmaker.py:47
 msgid "Match not found by MatchMaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:89
+#: quantum/openstack/common/rpc/matchmaker.py:83
 msgid "Matchmaker does not implement registration or heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:239
+#: quantum/openstack/common/rpc/matchmaker.py:233
 #, python-format
-msgid "Matchmaker unregistered: %s, %s"
+msgid "Matchmaker unregistered: %(key)s, %(host)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:250
+#: quantum/openstack/common/rpc/matchmaker.py:245
 msgid "Register before starting heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:343
-#: quantum/openstack/common/rpc/matchmaker.py:361
+#: quantum/openstack/common/rpc/matchmaker_ring.py:81
+#: quantum/openstack/common/rpc/matchmaker_ring.py:99
 #, python-format
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
@@ -5125,7 +5149,7 @@ msgstr ""
 #: quantum/plugins/midonet/midonet_lib.py:278
 #, python-format
 msgid ""
-"RuleManager.create_for_sg_rule: adding accept rule %(rule_id) in "
+"RuleManager.create_for_sg_rule: adding accept rule %(rule_id)s in "
 "portgroup %(port_group_id)s"
 msgstr ""
 
@@ -5223,7 +5247,7 @@ msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
 #: quantum/plugins/midonet/plugin.py:319
-#: quantum/plugins/nicira/QuantumPlugin.py:1025
+#: quantum/plugins/nicira/QuantumPlugin.py:1030
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
@@ -6090,408 +6114,408 @@ msgstr ""
 msgid "The request has timed out."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:223
+#: quantum/plugins/nicira/QuantumPlugin.py:228
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:258
+#: quantum/plugins/nicira/QuantumPlugin.py:263
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:260
+#: quantum/plugins/nicira/QuantumPlugin.py:265
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:263
+#: quantum/plugins/nicira/QuantumPlugin.py:268
 #, python-format
 msgid ""
 "Unable to create logical router port for quantum port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:285
+#: quantum/plugins/nicira/QuantumPlugin.py:290
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:291
+#: quantum/plugins/nicira/QuantumPlugin.py:296
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
 "associated with Quantum %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:297
+#: quantum/plugins/nicira/QuantumPlugin.py:302
 #, python-format
 msgid ""
 "Unable to plug attachment in router port %(r_port_id)s for quantum port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:342
+#: quantum/plugins/nicira/QuantumPlugin.py:347
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:367
-#: quantum/plugins/nicira/QuantumPlugin.py:402
-#: quantum/plugins/nicira/QuantumPlugin.py:592
+#: quantum/plugins/nicira/QuantumPlugin.py:372
+#: quantum/plugins/nicira/QuantumPlugin.py:407
+#: quantum/plugins/nicira/QuantumPlugin.py:597
 #, python-format
 msgid ""
 "NVP plugin does not support regular VIF ports on external networks. Port "
 "%s will be down."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:387
-#: quantum/plugins/nicira/QuantumPlugin.py:468
-#: quantum/plugins/nicira/QuantumPlugin.py:612
+#: quantum/plugins/nicira/QuantumPlugin.py:392
+#: quantum/plugins/nicira/QuantumPlugin.py:473
+#: quantum/plugins/nicira/QuantumPlugin.py:617
 #, python-format
 msgid ""
 "_nvp_create_port completed for port %(name)s on network %(network_id)s. "
 "The new port id is %(id)s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:391
+#: quantum/plugins/nicira/QuantumPlugin.py:396
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:409
+#: quantum/plugins/nicira/QuantumPlugin.py:414
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:418
+#: quantum/plugins/nicira/QuantumPlugin.py:423
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:424
+#: quantum/plugins/nicira/QuantumPlugin.py:429
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:443
-#: quantum/plugins/nicira/QuantumPlugin.py:876
+#: quantum/plugins/nicira/QuantumPlugin.py:448
+#: quantum/plugins/nicira/QuantumPlugin.py:881
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:455
+#: quantum/plugins/nicira/QuantumPlugin.py:460
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:473
+#: quantum/plugins/nicira/QuantumPlugin.py:478
 msgid "An exception occured while plugging the interface"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:481
+#: quantum/plugins/nicira/QuantumPlugin.py:486
 #, python-format
 msgid ""
 "device_id field must be populated in order to create an external gateway "
 "port for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:489
+#: quantum/plugins/nicira/QuantumPlugin.py:494
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:535
+#: quantum/plugins/nicira/QuantumPlugin.py:540
 #, python-format
 msgid ""
 "_nvp_create_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s. NVP port id is %(nvp_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:573
+#: quantum/plugins/nicira/QuantumPlugin.py:578
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:577
-#: quantum/plugins/nicira/QuantumPlugin.py:1718
+#: quantum/plugins/nicira/QuantumPlugin.py:582
+#: quantum/plugins/nicira/QuantumPlugin.py:1723
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:579
+#: quantum/plugins/nicira/QuantumPlugin.py:584
 #, python-format
 msgid ""
 "_nvp_delete_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:617
+#: quantum/plugins/nicira/QuantumPlugin.py:622
 #, python-format
 msgid "An exception occured while plugging the gateway interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:657
+#: quantum/plugins/nicira/QuantumPlugin.py:662
 #, python-format
 msgid "Unable to find NVP uuid for Quantum port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:686
+#: quantum/plugins/nicira/QuantumPlugin.py:691
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:690
+#: quantum/plugins/nicira/QuantumPlugin.py:695
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:694
+#: quantum/plugins/nicira/QuantumPlugin.py:699
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:698
-#: quantum/plugins/nicira/QuantumPlugin.py:713
+#: quantum/plugins/nicira/QuantumPlugin.py:703
+#: quantum/plugins/nicira/QuantumPlugin.py:718
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:719
+#: quantum/plugins/nicira/QuantumPlugin.py:724
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:750
+#: quantum/plugins/nicira/QuantumPlugin.py:755
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:772
+#: quantum/plugins/nicira/QuantumPlugin.py:777
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:799
+#: quantum/plugins/nicira/QuantumPlugin.py:804
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not yet supported by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:858
+#: quantum/plugins/nicira/QuantumPlugin.py:863
 #, python-format
 msgid "A nvp lport identifier was not found for quantum port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:886
+#: quantum/plugins/nicira/QuantumPlugin.py:891
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:889
+#: quantum/plugins/nicira/QuantumPlugin.py:894
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:915
+#: quantum/plugins/nicira/QuantumPlugin.py:920
 #, python-format
 msgid ""
 "Current network status:%(nvp_net_status)s; Status in Quantum "
 "DB:%(quantum_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:925
-#: quantum/plugins/nicira/QuantumPlugin.py:975
+#: quantum/plugins/nicira/QuantumPlugin.py:930
+#: quantum/plugins/nicira/QuantumPlugin.py:980
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:989
+#: quantum/plugins/nicira/QuantumPlugin.py:994
 #, python-format
 msgid "Logical Switch %s found in quantum database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1004
+#: quantum/plugins/nicira/QuantumPlugin.py:1009
 #, python-format
 msgid ""
 "Found %s logical switches not bound to Quantum networks. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1008
+#: quantum/plugins/nicira/QuantumPlugin.py:1013
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1091
+#: quantum/plugins/nicira/QuantumPlugin.py:1096
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1100
+#: quantum/plugins/nicira/QuantumPlugin.py:1105
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1127
+#: quantum/plugins/nicira/QuantumPlugin.py:1132
 #, python-format
 msgid "Quantum logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1134
+#: quantum/plugins/nicira/QuantumPlugin.py:1139
 #, python-format
 msgid ""
 "Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1196
+#: quantum/plugins/nicira/QuantumPlugin.py:1201
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1202
+#: quantum/plugins/nicira/QuantumPlugin.py:1207
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1207
+#: quantum/plugins/nicira/QuantumPlugin.py:1212
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1271
+#: quantum/plugins/nicira/QuantumPlugin.py:1276
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1296
+#: quantum/plugins/nicira/QuantumPlugin.py:1301
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1410
-#: quantum/plugins/nicira/QuantumPlugin.py:1455
+#: quantum/plugins/nicira/QuantumPlugin.py:1415
+#: quantum/plugins/nicira/QuantumPlugin.py:1460
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1423
+#: quantum/plugins/nicira/QuantumPlugin.py:1428
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1465
+#: quantum/plugins/nicira/QuantumPlugin.py:1470
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1468
+#: quantum/plugins/nicira/QuantumPlugin.py:1473
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1488
+#: quantum/plugins/nicira/QuantumPlugin.py:1493
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1492
+#: quantum/plugins/nicira/QuantumPlugin.py:1497
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1513
+#: quantum/plugins/nicira/QuantumPlugin.py:1518
 #, python-format
 msgid ""
 "Current router status:%(router_status)s;Status in Quantum "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1521
+#: quantum/plugins/nicira/QuantumPlugin.py:1526
 msgid "Unable to get logical router"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1544
+#: quantum/plugins/nicira/QuantumPlugin.py:1549
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1566
+#: quantum/plugins/nicira/QuantumPlugin.py:1571
 #, python-format
 msgid ""
 "Found %s logical routers not bound to Quantum routers. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1593
+#: quantum/plugins/nicira/QuantumPlugin.py:1598
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1628
+#: quantum/plugins/nicira/QuantumPlugin.py:1633
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1673
+#: quantum/plugins/nicira/QuantumPlugin.py:1678
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1685
+#: quantum/plugins/nicira/QuantumPlugin.py:1690
 #, python-format
 msgid ""
 "Unable to find NVP logical router port for Quantum port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1714
+#: quantum/plugins/nicira/QuantumPlugin.py:1719
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1740
+#: quantum/plugins/nicira/QuantumPlugin.py:1745
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1746
+#: quantum/plugins/nicira/QuantumPlugin.py:1751
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1812
+#: quantum/plugins/nicira/QuantumPlugin.py:1817
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1836
+#: quantum/plugins/nicira/QuantumPlugin.py:1841
 #, python-format
 msgid ""
 "An error occurred while creating NAT rules on the NVP platform for "
 "floating ip:%(floating_ip)s mapped to internal ip:%(internal_ip)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1878
+#: quantum/plugins/nicira/QuantumPlugin.py:1883
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1881
+#: quantum/plugins/nicira/QuantumPlugin.py:1886
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1907
+#: quantum/plugins/nicira/QuantumPlugin.py:1912
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1929
+#: quantum/plugins/nicira/QuantumPlugin.py:1934
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
@@ -6537,69 +6561,69 @@ msgstr ""
 msgid "The network gateway %(gateway_id)s cannot be updated or deleted"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:152
+#: quantum/plugins/nicira/nicira_networkgw_db.py:160
 msgid ""
 "A network identifier must be specified when connecting a network to a "
 "network gateway. Unable to complete operation"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:158
+#: quantum/plugins/nicira/nicira_networkgw_db.py:166
 #, python-format
 msgid ""
 "Invalid keys found among the ones provided in request body: "
 "%(connection_attrs)s."
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:164
+#: quantum/plugins/nicira/nicira_networkgw_db.py:172
 msgid ""
 "In order to specify a segmentation id the segmentation type must be "
 "specified as well"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:168
+#: quantum/plugins/nicira/nicira_networkgw_db.py:176
 msgid "Cannot specify a segmentation id when the segmentation type is flat"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:217
+#: quantum/plugins/nicira/nicira_networkgw_db.py:225
 #, python-format
 msgid "Created network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:230
+#: quantum/plugins/nicira/nicira_networkgw_db.py:237
 #, python-format
 msgid "Updated network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:245
+#: quantum/plugins/nicira/nicira_networkgw_db.py:252
 #, python-format
 msgid "Network gateway '%s' was destroyed."
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:255
+#: quantum/plugins/nicira/nicira_networkgw_db.py:262
 #, python-format
 msgid "Connecting network '%(network_id)s' to gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:296
+#: quantum/plugins/nicira/nicira_networkgw_db.py:303
 #, python-format
 msgid ""
 "Requested network '%(network_id)s' not found.Unable to create network "
 "connection on gateway '%(network_gateway_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:304
+#: quantum/plugins/nicira/nicira_networkgw_db.py:311
 #, python-format
 msgid ""
 "Gateway port for '%(network_gateway_id)s' created on network "
 "'%(network_id)s':%(port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:320
+#: quantum/plugins/nicira/nicira_networkgw_db.py:327
 #, python-format
 msgid "Ensured no Ip addresses are configured on port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:330
+#: quantum/plugins/nicira/nicira_networkgw_db.py:337
 #, python-format
 msgid ""
 "Disconnecting network '%(network_id)s' from gateway "
@@ -7230,11 +7254,11 @@ msgid ""
 "router:'%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:63
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:66
 msgid "Cannot create a gateway with an empty device list"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:89
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:92
 msgid "number of network gateways allowed per tenant, -1 for unlimited"
 msgstr ""
 
@@ -7971,3 +7995,14 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
+#~ msgid "no calling threads waiting for msg_id : %s, message : %s"
+#~ msgstr ""
+
+#~ msgid "Matchmaker unregistered: %s, %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "RuleManager.create_for_sg_rule: adding accept rule"
+#~ " %(rule_id) in portgroup %(port_group_id)s"
+#~ msgstr ""
+

diff --git a/quantum/locale/ka_GE/LC_MESSAGES/quantum.po b/quantum/locale/ka_GE/LC_MESSAGES/quantum.po
index edc6de81c0c039be5d39cc5a521bba9b24c6dec4..a51935103368516d9faa31d85c03d68ed4cb72c8 100644 (file)
--- a/quantum/locale/ka_GE/LC_MESSAGES/quantum.po
+++ b/quantum/locale/ka_GE/LC_MESSAGES/quantum.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-05-26 12:11+0000\n"
+"POT-Creation-Date: 2013-05-27 12:11+0000\n"
 "PO-Revision-Date: 2013-04-19 14:53+0000\n"
 "Last-Translator: Nika Chkhikvishvili <frrrredo@gmail.com>\n"
 "Language-Team: ka_GE <LL@li.org>\n"
@@ -2235,7 +2235,7 @@ msgid ""
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:594 quantum/plugins/nicira/QuantumPlugin.py:1773
+#: quantum/db/l3_db.py:594 quantum/plugins/nicira/QuantumPlugin.py:1778
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
@@ -2808,7 +2808,7 @@ msgid "Was expecting a dict for service definition, found the following: %s"
 msgstr ""
 
 #: quantum/extensions/servicetype.py:160
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:83
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:86
 #, python-format
 msgid "%s: provided data are not iterable"
 msgstr ""
@@ -2832,47 +2832,47 @@ msgstr ""
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:98
+#: quantum/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:184
+#: quantum/openstack/common/lockutils.py:188
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:195
+#: quantum/openstack/common/lockutils.py:199
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:222
+#: quantum/openstack/common/lockutils.py:226
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:230
+#: quantum/openstack/common/lockutils.py:234
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/log.py:226
+#: quantum/openstack/common/log.py:244
 #, python-format
 msgid "Deprecated: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:329
+#: quantum/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:379
+#: quantum/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:537
+#: quantum/openstack/common/log.py:555
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2895,120 +2895,134 @@ msgstr ""
 msgid "in dynamic looping call"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:41
+#: quantum/openstack/common/periodic_task.py:42
 #, python-format
 msgid "Unexpected argument for periodic task creation: %(arg)s."
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:132
+#: quantum/openstack/common/periodic_task.py:133
 #, python-format
 msgid "Skipping periodic task %(task)s because its interval is negative"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:137
+#: quantum/openstack/common/periodic_task.py:138
 #, python-format
 msgid "Skipping periodic task %(task)s because it is disabled"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:175
+#: quantum/openstack/common/periodic_task.py:176
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:183
+#: quantum/openstack/common/periodic_task.py:184
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:394
+#: quantum/openstack/common/policy.py:395
 #, python-format
 msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:404
+#: quantum/openstack/common/policy.py:405
 #, python-format
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:679
+#: quantum/openstack/common/policy.py:680
 #, python-format
 msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:122
+#: quantum/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:137
+#: quantum/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:162
+#: quantum/openstack/common/processutils.py:167
+#: quantum/openstack/common/processutils.py:240
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:174
+#: quantum/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: quantum/openstack/common/service.py:112
-#: quantum/openstack/common/service.py:275
+#: quantum/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
+#: quantum/openstack/common/processutils.py:221
+msgid "Environment not supported over SSH"
+msgstr ""
+
+#: quantum/openstack/common/processutils.py:225
+msgid "process_input not supported over SSH"
+msgstr ""
+
+#: quantum/openstack/common/service.py:113
+#: quantum/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: quantum/openstack/common/service.py:121
-#: quantum/openstack/common/service.py:218
+#: quantum/openstack/common/service.py:122
+#: quantum/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:164
+#: quantum/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:200
+#: quantum/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: quantum/openstack/common/service.py:223
+#: quantum/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: quantum/openstack/common/service.py:230
+#: quantum/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:240
+#: quantum/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: quantum/openstack/common/service.py:257
+#: quantum/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:261
+#: quantum/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:265
+#: quantum/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
 
-#: quantum/openstack/common/service.py:293
+#: quantum/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: quantum/openstack/common/service.py:304
+#: quantum/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -3054,131 +3068,136 @@ msgstr ""
 
 #: quantum/openstack/common/rpc/amqp.py:200
 #, python-format
-msgid "no calling threads waiting for msg_id : %s, message : %s"
+msgid "no calling threads waiting for msg_id : %(msg_id)s, message : %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:208
+#: quantum/openstack/common/rpc/amqp.py:209
 #, python-format
 msgid ""
 "Number of call waiters is greater than warning threshhold: %d. There "
 "could be a MulticallProxyWaiter leak."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:291
+#: quantum/openstack/common/rpc/amqp.py:292
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:337
+#: quantum/openstack/common/rpc/amqp.py:338
 #, python-format
 msgid "UNIQUE_ID is %s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:406
+#: quantum/openstack/common/rpc/amqp.py:407
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:414
+#: quantum/openstack/common/rpc/amqp.py:415
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:415
+#: quantum/openstack/common/rpc/amqp.py:416
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:443
+#: quantum/openstack/common/rpc/amqp.py:444
 #: quantum/openstack/common/rpc/impl_zmq.py:286
 #, python-format
 msgid "Expected exception during message handling (%s)"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:451
+#: quantum/openstack/common/rpc/amqp.py:452
 #: quantum/openstack/common/rpc/impl_zmq.py:292
 msgid "Exception during message handling"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:586
+#: quantum/openstack/common/rpc/amqp.py:587
 #, python-format
 msgid "Making synchronous call on %s ..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:589
+#: quantum/openstack/common/rpc/amqp.py:590
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:623
+#: quantum/openstack/common/rpc/amqp.py:624
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:632
+#: quantum/openstack/common/rpc/amqp.py:633
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:660
+#: quantum/openstack/common/rpc/amqp.py:661
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:74
+#: quantum/openstack/common/rpc/common.py:75
 msgid "An unknown RPC related exception occurred."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:86
+#: quantum/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:104
+#: quantum/openstack/common/rpc/common.py:105
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:121
+#: quantum/openstack/common/rpc/common.py:122
 #, python-format
 msgid ""
 "Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:"
 " \"%(method)s\" info: \"%(info)s\""
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:137
 #: quantum/openstack/common/rpc/common.py:138
 #: quantum/openstack/common/rpc/common.py:139
+#: quantum/openstack/common/rpc/common.py:140
 msgid "<unknown>"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:143
+#: quantum/openstack/common/rpc/common.py:144
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:147
+#: quantum/openstack/common/rpc/common.py:148
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:151
+#: quantum/openstack/common/rpc/common.py:152
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:156
+#: quantum/openstack/common/rpc/common.py:157
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:280
+#: quantum/openstack/common/rpc/common.py:162
+#, python-format
+msgid "Specified RPC version cap, %(version_cap)s, is too low"
+msgstr ""
+
+#: quantum/openstack/common/rpc/common.py:285
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:302
+#: quantum/openstack/common/rpc/common.py:307
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
@@ -3441,25 +3460,30 @@ msgstr ""
 msgid "No match from matchmaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:53
+#: quantum/openstack/common/rpc/impl_zmq.py:852
+#, python-format
+msgid "rpc_zmq_matchmaker = %(orig)s is deprecated; use %(new)s instead"
+msgstr ""
+
+#: quantum/openstack/common/rpc/matchmaker.py:47
 msgid "Match not found by MatchMaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:89
+#: quantum/openstack/common/rpc/matchmaker.py:83
 msgid "Matchmaker does not implement registration or heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:239
+#: quantum/openstack/common/rpc/matchmaker.py:233
 #, python-format
-msgid "Matchmaker unregistered: %s, %s"
+msgid "Matchmaker unregistered: %(key)s, %(host)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:250
+#: quantum/openstack/common/rpc/matchmaker.py:245
 msgid "Register before starting heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:343
-#: quantum/openstack/common/rpc/matchmaker.py:361
+#: quantum/openstack/common/rpc/matchmaker_ring.py:81
+#: quantum/openstack/common/rpc/matchmaker_ring.py:99
 #, python-format
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
@@ -5124,7 +5148,7 @@ msgstr ""
 #: quantum/plugins/midonet/midonet_lib.py:278
 #, python-format
 msgid ""
-"RuleManager.create_for_sg_rule: adding accept rule %(rule_id) in "
+"RuleManager.create_for_sg_rule: adding accept rule %(rule_id)s in "
 "portgroup %(port_group_id)s"
 msgstr ""
 
@@ -5222,7 +5246,7 @@ msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
 #: quantum/plugins/midonet/plugin.py:319
-#: quantum/plugins/nicira/QuantumPlugin.py:1025
+#: quantum/plugins/nicira/QuantumPlugin.py:1030
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
@@ -6090,408 +6114,408 @@ msgstr ""
 msgid "The request has timed out."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:223
+#: quantum/plugins/nicira/QuantumPlugin.py:228
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:258
+#: quantum/plugins/nicira/QuantumPlugin.py:263
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:260
+#: quantum/plugins/nicira/QuantumPlugin.py:265
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:263
+#: quantum/plugins/nicira/QuantumPlugin.py:268
 #, python-format
 msgid ""
 "Unable to create logical router port for quantum port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:285
+#: quantum/plugins/nicira/QuantumPlugin.py:290
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:291
+#: quantum/plugins/nicira/QuantumPlugin.py:296
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
 "associated with Quantum %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:297
+#: quantum/plugins/nicira/QuantumPlugin.py:302
 #, python-format
 msgid ""
 "Unable to plug attachment in router port %(r_port_id)s for quantum port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:342
+#: quantum/plugins/nicira/QuantumPlugin.py:347
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:367
-#: quantum/plugins/nicira/QuantumPlugin.py:402
-#: quantum/plugins/nicira/QuantumPlugin.py:592
+#: quantum/plugins/nicira/QuantumPlugin.py:372
+#: quantum/plugins/nicira/QuantumPlugin.py:407
+#: quantum/plugins/nicira/QuantumPlugin.py:597
 #, python-format
 msgid ""
 "NVP plugin does not support regular VIF ports on external networks. Port "
 "%s will be down."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:387
-#: quantum/plugins/nicira/QuantumPlugin.py:468
-#: quantum/plugins/nicira/QuantumPlugin.py:612
+#: quantum/plugins/nicira/QuantumPlugin.py:392
+#: quantum/plugins/nicira/QuantumPlugin.py:473
+#: quantum/plugins/nicira/QuantumPlugin.py:617
 #, python-format
 msgid ""
 "_nvp_create_port completed for port %(name)s on network %(network_id)s. "
 "The new port id is %(id)s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:391
+#: quantum/plugins/nicira/QuantumPlugin.py:396
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:409
+#: quantum/plugins/nicira/QuantumPlugin.py:414
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:418
+#: quantum/plugins/nicira/QuantumPlugin.py:423
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:424
+#: quantum/plugins/nicira/QuantumPlugin.py:429
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:443
-#: quantum/plugins/nicira/QuantumPlugin.py:876
+#: quantum/plugins/nicira/QuantumPlugin.py:448
+#: quantum/plugins/nicira/QuantumPlugin.py:881
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:455
+#: quantum/plugins/nicira/QuantumPlugin.py:460
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:473
+#: quantum/plugins/nicira/QuantumPlugin.py:478
 msgid "An exception occured while plugging the interface"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:481
+#: quantum/plugins/nicira/QuantumPlugin.py:486
 #, python-format
 msgid ""
 "device_id field must be populated in order to create an external gateway "
 "port for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:489
+#: quantum/plugins/nicira/QuantumPlugin.py:494
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:535
+#: quantum/plugins/nicira/QuantumPlugin.py:540
 #, python-format
 msgid ""
 "_nvp_create_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s. NVP port id is %(nvp_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:573
+#: quantum/plugins/nicira/QuantumPlugin.py:578
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:577
-#: quantum/plugins/nicira/QuantumPlugin.py:1718
+#: quantum/plugins/nicira/QuantumPlugin.py:582
+#: quantum/plugins/nicira/QuantumPlugin.py:1723
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:579
+#: quantum/plugins/nicira/QuantumPlugin.py:584
 #, python-format
 msgid ""
 "_nvp_delete_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:617
+#: quantum/plugins/nicira/QuantumPlugin.py:622
 #, python-format
 msgid "An exception occured while plugging the gateway interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:657
+#: quantum/plugins/nicira/QuantumPlugin.py:662
 #, python-format
 msgid "Unable to find NVP uuid for Quantum port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:686
+#: quantum/plugins/nicira/QuantumPlugin.py:691
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:690
+#: quantum/plugins/nicira/QuantumPlugin.py:695
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:694
+#: quantum/plugins/nicira/QuantumPlugin.py:699
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:698
-#: quantum/plugins/nicira/QuantumPlugin.py:713
+#: quantum/plugins/nicira/QuantumPlugin.py:703
+#: quantum/plugins/nicira/QuantumPlugin.py:718
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:719
+#: quantum/plugins/nicira/QuantumPlugin.py:724
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:750
+#: quantum/plugins/nicira/QuantumPlugin.py:755
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:772
+#: quantum/plugins/nicira/QuantumPlugin.py:777
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:799
+#: quantum/plugins/nicira/QuantumPlugin.py:804
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not yet supported by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:858
+#: quantum/plugins/nicira/QuantumPlugin.py:863
 #, python-format
 msgid "A nvp lport identifier was not found for quantum port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:886
+#: quantum/plugins/nicira/QuantumPlugin.py:891
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:889
+#: quantum/plugins/nicira/QuantumPlugin.py:894
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:915
+#: quantum/plugins/nicira/QuantumPlugin.py:920
 #, python-format
 msgid ""
 "Current network status:%(nvp_net_status)s; Status in Quantum "
 "DB:%(quantum_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:925
-#: quantum/plugins/nicira/QuantumPlugin.py:975
+#: quantum/plugins/nicira/QuantumPlugin.py:930
+#: quantum/plugins/nicira/QuantumPlugin.py:980
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:989
+#: quantum/plugins/nicira/QuantumPlugin.py:994
 #, python-format
 msgid "Logical Switch %s found in quantum database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1004
+#: quantum/plugins/nicira/QuantumPlugin.py:1009
 #, python-format
 msgid ""
 "Found %s logical switches not bound to Quantum networks. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1008
+#: quantum/plugins/nicira/QuantumPlugin.py:1013
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1091
+#: quantum/plugins/nicira/QuantumPlugin.py:1096
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1100
+#: quantum/plugins/nicira/QuantumPlugin.py:1105
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1127
+#: quantum/plugins/nicira/QuantumPlugin.py:1132
 #, python-format
 msgid "Quantum logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1134
+#: quantum/plugins/nicira/QuantumPlugin.py:1139
 #, python-format
 msgid ""
 "Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1196
+#: quantum/plugins/nicira/QuantumPlugin.py:1201
 #, fuzzy, python-format
 msgid "Network %s was not found in NVP."
 msgstr "პლაგინი ვერ მოიძებნა."
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1202
+#: quantum/plugins/nicira/QuantumPlugin.py:1207
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1207
+#: quantum/plugins/nicira/QuantumPlugin.py:1212
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1271
+#: quantum/plugins/nicira/QuantumPlugin.py:1276
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1296
+#: quantum/plugins/nicira/QuantumPlugin.py:1301
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1410
-#: quantum/plugins/nicira/QuantumPlugin.py:1455
+#: quantum/plugins/nicira/QuantumPlugin.py:1415
+#: quantum/plugins/nicira/QuantumPlugin.py:1460
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1423
+#: quantum/plugins/nicira/QuantumPlugin.py:1428
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1465
+#: quantum/plugins/nicira/QuantumPlugin.py:1470
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1468
+#: quantum/plugins/nicira/QuantumPlugin.py:1473
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1488
+#: quantum/plugins/nicira/QuantumPlugin.py:1493
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1492
+#: quantum/plugins/nicira/QuantumPlugin.py:1497
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1513
+#: quantum/plugins/nicira/QuantumPlugin.py:1518
 #, python-format
 msgid ""
 "Current router status:%(router_status)s;Status in Quantum "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1521
+#: quantum/plugins/nicira/QuantumPlugin.py:1526
 msgid "Unable to get logical router"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1544
+#: quantum/plugins/nicira/QuantumPlugin.py:1549
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1566
+#: quantum/plugins/nicira/QuantumPlugin.py:1571
 #, python-format
 msgid ""
 "Found %s logical routers not bound to Quantum routers. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1593
+#: quantum/plugins/nicira/QuantumPlugin.py:1598
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1628
+#: quantum/plugins/nicira/QuantumPlugin.py:1633
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1673
+#: quantum/plugins/nicira/QuantumPlugin.py:1678
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1685
+#: quantum/plugins/nicira/QuantumPlugin.py:1690
 #, python-format
 msgid ""
 "Unable to find NVP logical router port for Quantum port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1714
+#: quantum/plugins/nicira/QuantumPlugin.py:1719
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1740
+#: quantum/plugins/nicira/QuantumPlugin.py:1745
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1746
+#: quantum/plugins/nicira/QuantumPlugin.py:1751
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1812
+#: quantum/plugins/nicira/QuantumPlugin.py:1817
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1836
+#: quantum/plugins/nicira/QuantumPlugin.py:1841
 #, python-format
 msgid ""
 "An error occurred while creating NAT rules on the NVP platform for "
 "floating ip:%(floating_ip)s mapped to internal ip:%(internal_ip)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1878
+#: quantum/plugins/nicira/QuantumPlugin.py:1883
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1881
+#: quantum/plugins/nicira/QuantumPlugin.py:1886
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1907
+#: quantum/plugins/nicira/QuantumPlugin.py:1912
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1929
+#: quantum/plugins/nicira/QuantumPlugin.py:1934
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
@@ -6537,69 +6561,69 @@ msgstr ""
 msgid "The network gateway %(gateway_id)s cannot be updated or deleted"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:152
+#: quantum/plugins/nicira/nicira_networkgw_db.py:160
 msgid ""
 "A network identifier must be specified when connecting a network to a "
 "network gateway. Unable to complete operation"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:158
+#: quantum/plugins/nicira/nicira_networkgw_db.py:166
 #, python-format
 msgid ""
 "Invalid keys found among the ones provided in request body: "
 "%(connection_attrs)s."
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:164
+#: quantum/plugins/nicira/nicira_networkgw_db.py:172
 msgid ""
 "In order to specify a segmentation id the segmentation type must be "
 "specified as well"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:168
+#: quantum/plugins/nicira/nicira_networkgw_db.py:176
 msgid "Cannot specify a segmentation id when the segmentation type is flat"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:217
+#: quantum/plugins/nicira/nicira_networkgw_db.py:225
 #, python-format
 msgid "Created network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:230
+#: quantum/plugins/nicira/nicira_networkgw_db.py:237
 #, python-format
 msgid "Updated network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:245
+#: quantum/plugins/nicira/nicira_networkgw_db.py:252
 #, python-format
 msgid "Network gateway '%s' was destroyed."
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:255
+#: quantum/plugins/nicira/nicira_networkgw_db.py:262
 #, python-format
 msgid "Connecting network '%(network_id)s' to gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:296
+#: quantum/plugins/nicira/nicira_networkgw_db.py:303
 #, python-format
 msgid ""
 "Requested network '%(network_id)s' not found.Unable to create network "
 "connection on gateway '%(network_gateway_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:304
+#: quantum/plugins/nicira/nicira_networkgw_db.py:311
 #, python-format
 msgid ""
 "Gateway port for '%(network_gateway_id)s' created on network "
 "'%(network_id)s':%(port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:320
+#: quantum/plugins/nicira/nicira_networkgw_db.py:327
 #, python-format
 msgid "Ensured no Ip addresses are configured on port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:330
+#: quantum/plugins/nicira/nicira_networkgw_db.py:337
 #, python-format
 msgid ""
 "Disconnecting network '%(network_id)s' from gateway "
@@ -7230,11 +7254,11 @@ msgid ""
 "router:'%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:63
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:66
 msgid "Cannot create a gateway with an empty device list"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:89
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:92
 msgid "number of network gateways allowed per tenant, -1 for unlimited"
 msgstr ""
 
@@ -7971,3 +7995,14 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
+#~ msgid "no calling threads waiting for msg_id : %s, message : %s"
+#~ msgstr ""
+
+#~ msgid "Matchmaker unregistered: %s, %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "RuleManager.create_for_sg_rule: adding accept rule"
+#~ " %(rule_id) in portgroup %(port_group_id)s"
+#~ msgstr ""
+

diff --git a/quantum/locale/ko_KR/LC_MESSAGES/quantum.po b/quantum/locale/ko_KR/LC_MESSAGES/quantum.po
index f33b82bcfde3e878ac2132a5b651b5058b5b4f29..1ca2ffec25a457284e3b15696a10ecbde18e497e 100644 (file)
--- a/quantum/locale/ko_KR/LC_MESSAGES/quantum.po
+++ b/quantum/locale/ko_KR/LC_MESSAGES/quantum.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-05-26 12:11+0000\n"
+"POT-Creation-Date: 2013-05-27 12:11+0000\n"
 "PO-Revision-Date: 2013-04-28 05:13+0000\n"
 "Last-Translator: ujuc Gang <potopro@gmail.com>\n"
 "Language-Team: ko_KR <LL@li.org>\n"
@@ -2235,7 +2235,7 @@ msgid ""
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:594 quantum/plugins/nicira/QuantumPlugin.py:1773
+#: quantum/db/l3_db.py:594 quantum/plugins/nicira/QuantumPlugin.py:1778
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
@@ -2808,7 +2808,7 @@ msgid "Was expecting a dict for service definition, found the following: %s"
 msgstr ""
 
 #: quantum/extensions/servicetype.py:160
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:83
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:86
 #, python-format
 msgid "%s: provided data are not iterable"
 msgstr ""
@@ -2832,47 +2832,47 @@ msgstr ""
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:98
+#: quantum/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:184
+#: quantum/openstack/common/lockutils.py:188
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:195
+#: quantum/openstack/common/lockutils.py:199
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:222
+#: quantum/openstack/common/lockutils.py:226
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:230
+#: quantum/openstack/common/lockutils.py:234
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/log.py:226
+#: quantum/openstack/common/log.py:244
 #, python-format
 msgid "Deprecated: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:329
+#: quantum/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:379
+#: quantum/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:537
+#: quantum/openstack/common/log.py:555
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2895,120 +2895,134 @@ msgstr ""
 msgid "in dynamic looping call"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:41
+#: quantum/openstack/common/periodic_task.py:42
 #, python-format
 msgid "Unexpected argument for periodic task creation: %(arg)s."
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:132
+#: quantum/openstack/common/periodic_task.py:133
 #, python-format
 msgid "Skipping periodic task %(task)s because its interval is negative"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:137
+#: quantum/openstack/common/periodic_task.py:138
 #, python-format
 msgid "Skipping periodic task %(task)s because it is disabled"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:175
+#: quantum/openstack/common/periodic_task.py:176
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:183
+#: quantum/openstack/common/periodic_task.py:184
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:394
+#: quantum/openstack/common/policy.py:395
 #, python-format
 msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:404
+#: quantum/openstack/common/policy.py:405
 #, python-format
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:679
+#: quantum/openstack/common/policy.py:680
 #, python-format
 msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:122
+#: quantum/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:137
+#: quantum/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:162
+#: quantum/openstack/common/processutils.py:167
+#: quantum/openstack/common/processutils.py:240
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:174
+#: quantum/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: quantum/openstack/common/service.py:112
-#: quantum/openstack/common/service.py:275
+#: quantum/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
+#: quantum/openstack/common/processutils.py:221
+msgid "Environment not supported over SSH"
+msgstr ""
+
+#: quantum/openstack/common/processutils.py:225
+msgid "process_input not supported over SSH"
+msgstr ""
+
+#: quantum/openstack/common/service.py:113
+#: quantum/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: quantum/openstack/common/service.py:121
-#: quantum/openstack/common/service.py:218
+#: quantum/openstack/common/service.py:122
+#: quantum/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:164
+#: quantum/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:200
+#: quantum/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: quantum/openstack/common/service.py:223
+#: quantum/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: quantum/openstack/common/service.py:230
+#: quantum/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:240
+#: quantum/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: quantum/openstack/common/service.py:257
+#: quantum/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:261
+#: quantum/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:265
+#: quantum/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
 
-#: quantum/openstack/common/service.py:293
+#: quantum/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: quantum/openstack/common/service.py:304
+#: quantum/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -3054,131 +3068,136 @@ msgstr ""
 
 #: quantum/openstack/common/rpc/amqp.py:200
 #, python-format
-msgid "no calling threads waiting for msg_id : %s, message : %s"
+msgid "no calling threads waiting for msg_id : %(msg_id)s, message : %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:208
+#: quantum/openstack/common/rpc/amqp.py:209
 #, python-format
 msgid ""
 "Number of call waiters is greater than warning threshhold: %d. There "
 "could be a MulticallProxyWaiter leak."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:291
+#: quantum/openstack/common/rpc/amqp.py:292
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:337
+#: quantum/openstack/common/rpc/amqp.py:338
 #, python-format
 msgid "UNIQUE_ID is %s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:406
+#: quantum/openstack/common/rpc/amqp.py:407
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:414
+#: quantum/openstack/common/rpc/amqp.py:415
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:415
+#: quantum/openstack/common/rpc/amqp.py:416
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:443
+#: quantum/openstack/common/rpc/amqp.py:444
 #: quantum/openstack/common/rpc/impl_zmq.py:286
 #, python-format
 msgid "Expected exception during message handling (%s)"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:451
+#: quantum/openstack/common/rpc/amqp.py:452
 #: quantum/openstack/common/rpc/impl_zmq.py:292
 msgid "Exception during message handling"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:586
+#: quantum/openstack/common/rpc/amqp.py:587
 #, python-format
 msgid "Making synchronous call on %s ..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:589
+#: quantum/openstack/common/rpc/amqp.py:590
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:623
+#: quantum/openstack/common/rpc/amqp.py:624
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:632
+#: quantum/openstack/common/rpc/amqp.py:633
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:660
+#: quantum/openstack/common/rpc/amqp.py:661
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:74
+#: quantum/openstack/common/rpc/common.py:75
 msgid "An unknown RPC related exception occurred."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:86
+#: quantum/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:104
+#: quantum/openstack/common/rpc/common.py:105
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:121
+#: quantum/openstack/common/rpc/common.py:122
 #, python-format
 msgid ""
 "Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:"
 " \"%(method)s\" info: \"%(info)s\""
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:137
 #: quantum/openstack/common/rpc/common.py:138
 #: quantum/openstack/common/rpc/common.py:139
+#: quantum/openstack/common/rpc/common.py:140
 msgid "<unknown>"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:143
+#: quantum/openstack/common/rpc/common.py:144
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:147
+#: quantum/openstack/common/rpc/common.py:148
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:151
+#: quantum/openstack/common/rpc/common.py:152
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:156
+#: quantum/openstack/common/rpc/common.py:157
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:280
+#: quantum/openstack/common/rpc/common.py:162
+#, python-format
+msgid "Specified RPC version cap, %(version_cap)s, is too low"
+msgstr ""
+
+#: quantum/openstack/common/rpc/common.py:285
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:302
+#: quantum/openstack/common/rpc/common.py:307
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
@@ -3441,25 +3460,30 @@ msgstr ""
 msgid "No match from matchmaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:53
+#: quantum/openstack/common/rpc/impl_zmq.py:852
+#, python-format
+msgid "rpc_zmq_matchmaker = %(orig)s is deprecated; use %(new)s instead"
+msgstr ""
+
+#: quantum/openstack/common/rpc/matchmaker.py:47
 msgid "Match not found by MatchMaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:89
+#: quantum/openstack/common/rpc/matchmaker.py:83
 msgid "Matchmaker does not implement registration or heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:239
+#: quantum/openstack/common/rpc/matchmaker.py:233
 #, python-format
-msgid "Matchmaker unregistered: %s, %s"
+msgid "Matchmaker unregistered: %(key)s, %(host)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:250
+#: quantum/openstack/common/rpc/matchmaker.py:245
 msgid "Register before starting heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:343
-#: quantum/openstack/common/rpc/matchmaker.py:361
+#: quantum/openstack/common/rpc/matchmaker_ring.py:81
+#: quantum/openstack/common/rpc/matchmaker_ring.py:99
 #, python-format
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
@@ -5124,7 +5148,7 @@ msgstr ""
 #: quantum/plugins/midonet/midonet_lib.py:278
 #, python-format
 msgid ""
-"RuleManager.create_for_sg_rule: adding accept rule %(rule_id) in "
+"RuleManager.create_for_sg_rule: adding accept rule %(rule_id)s in "
 "portgroup %(port_group_id)s"
 msgstr ""
 
@@ -5222,7 +5246,7 @@ msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
 #: quantum/plugins/midonet/plugin.py:319
-#: quantum/plugins/nicira/QuantumPlugin.py:1025
+#: quantum/plugins/nicira/QuantumPlugin.py:1030
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
@@ -6089,408 +6113,408 @@ msgstr ""
 msgid "The request has timed out."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:223
+#: quantum/plugins/nicira/QuantumPlugin.py:228
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:258
+#: quantum/plugins/nicira/QuantumPlugin.py:263
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:260
+#: quantum/plugins/nicira/QuantumPlugin.py:265
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:263
+#: quantum/plugins/nicira/QuantumPlugin.py:268
 #, python-format
 msgid ""
 "Unable to create logical router port for quantum port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:285
+#: quantum/plugins/nicira/QuantumPlugin.py:290
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:291
+#: quantum/plugins/nicira/QuantumPlugin.py:296
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
 "associated with Quantum %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:297
+#: quantum/plugins/nicira/QuantumPlugin.py:302
 #, python-format
 msgid ""
 "Unable to plug attachment in router port %(r_port_id)s for quantum port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:342
+#: quantum/plugins/nicira/QuantumPlugin.py:347
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:367
-#: quantum/plugins/nicira/QuantumPlugin.py:402
-#: quantum/plugins/nicira/QuantumPlugin.py:592
+#: quantum/plugins/nicira/QuantumPlugin.py:372
+#: quantum/plugins/nicira/QuantumPlugin.py:407
+#: quantum/plugins/nicira/QuantumPlugin.py:597
 #, python-format
 msgid ""
 "NVP plugin does not support regular VIF ports on external networks. Port "
 "%s will be down."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:387
-#: quantum/plugins/nicira/QuantumPlugin.py:468
-#: quantum/plugins/nicira/QuantumPlugin.py:612
+#: quantum/plugins/nicira/QuantumPlugin.py:392
+#: quantum/plugins/nicira/QuantumPlugin.py:473
+#: quantum/plugins/nicira/QuantumPlugin.py:617
 #, python-format
 msgid ""
 "_nvp_create_port completed for port %(name)s on network %(network_id)s. "
 "The new port id is %(id)s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:391
+#: quantum/plugins/nicira/QuantumPlugin.py:396
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:409
+#: quantum/plugins/nicira/QuantumPlugin.py:414
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:418
+#: quantum/plugins/nicira/QuantumPlugin.py:423
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:424
+#: quantum/plugins/nicira/QuantumPlugin.py:429
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:443
-#: quantum/plugins/nicira/QuantumPlugin.py:876
+#: quantum/plugins/nicira/QuantumPlugin.py:448
+#: quantum/plugins/nicira/QuantumPlugin.py:881
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:455
+#: quantum/plugins/nicira/QuantumPlugin.py:460
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:473
+#: quantum/plugins/nicira/QuantumPlugin.py:478
 msgid "An exception occured while plugging the interface"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:481
+#: quantum/plugins/nicira/QuantumPlugin.py:486
 #, python-format
 msgid ""
 "device_id field must be populated in order to create an external gateway "
 "port for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:489
+#: quantum/plugins/nicira/QuantumPlugin.py:494
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:535
+#: quantum/plugins/nicira/QuantumPlugin.py:540
 #, python-format
 msgid ""
 "_nvp_create_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s. NVP port id is %(nvp_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:573
+#: quantum/plugins/nicira/QuantumPlugin.py:578
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:577
-#: quantum/plugins/nicira/QuantumPlugin.py:1718
+#: quantum/plugins/nicira/QuantumPlugin.py:582
+#: quantum/plugins/nicira/QuantumPlugin.py:1723
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:579
+#: quantum/plugins/nicira/QuantumPlugin.py:584
 #, python-format
 msgid ""
 "_nvp_delete_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:617
+#: quantum/plugins/nicira/QuantumPlugin.py:622
 #, python-format
 msgid "An exception occured while plugging the gateway interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:657
+#: quantum/plugins/nicira/QuantumPlugin.py:662
 #, python-format
 msgid "Unable to find NVP uuid for Quantum port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:686
+#: quantum/plugins/nicira/QuantumPlugin.py:691
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:690
+#: quantum/plugins/nicira/QuantumPlugin.py:695
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:694
+#: quantum/plugins/nicira/QuantumPlugin.py:699
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:698
-#: quantum/plugins/nicira/QuantumPlugin.py:713
+#: quantum/plugins/nicira/QuantumPlugin.py:703
+#: quantum/plugins/nicira/QuantumPlugin.py:718
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:719
+#: quantum/plugins/nicira/QuantumPlugin.py:724
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:750
+#: quantum/plugins/nicira/QuantumPlugin.py:755
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:772
+#: quantum/plugins/nicira/QuantumPlugin.py:777
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:799
+#: quantum/plugins/nicira/QuantumPlugin.py:804
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not yet supported by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:858
+#: quantum/plugins/nicira/QuantumPlugin.py:863
 #, python-format
 msgid "A nvp lport identifier was not found for quantum port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:886
+#: quantum/plugins/nicira/QuantumPlugin.py:891
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:889
+#: quantum/plugins/nicira/QuantumPlugin.py:894
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:915
+#: quantum/plugins/nicira/QuantumPlugin.py:920
 #, python-format
 msgid ""
 "Current network status:%(nvp_net_status)s; Status in Quantum "
 "DB:%(quantum_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:925
-#: quantum/plugins/nicira/QuantumPlugin.py:975
+#: quantum/plugins/nicira/QuantumPlugin.py:930
+#: quantum/plugins/nicira/QuantumPlugin.py:980
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:989
+#: quantum/plugins/nicira/QuantumPlugin.py:994
 #, python-format
 msgid "Logical Switch %s found in quantum database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1004
+#: quantum/plugins/nicira/QuantumPlugin.py:1009
 #, python-format
 msgid ""
 "Found %s logical switches not bound to Quantum networks. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1008
+#: quantum/plugins/nicira/QuantumPlugin.py:1013
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1091
+#: quantum/plugins/nicira/QuantumPlugin.py:1096
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1100
+#: quantum/plugins/nicira/QuantumPlugin.py:1105
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1127
+#: quantum/plugins/nicira/QuantumPlugin.py:1132
 #, python-format
 msgid "Quantum logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1134
+#: quantum/plugins/nicira/QuantumPlugin.py:1139
 #, python-format
 msgid ""
 "Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1196
+#: quantum/plugins/nicira/QuantumPlugin.py:1201
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1202
+#: quantum/plugins/nicira/QuantumPlugin.py:1207
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1207
+#: quantum/plugins/nicira/QuantumPlugin.py:1212
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1271
+#: quantum/plugins/nicira/QuantumPlugin.py:1276
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1296
+#: quantum/plugins/nicira/QuantumPlugin.py:1301
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1410
-#: quantum/plugins/nicira/QuantumPlugin.py:1455
+#: quantum/plugins/nicira/QuantumPlugin.py:1415
+#: quantum/plugins/nicira/QuantumPlugin.py:1460
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1423
+#: quantum/plugins/nicira/QuantumPlugin.py:1428
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1465
+#: quantum/plugins/nicira/QuantumPlugin.py:1470
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1468
+#: quantum/plugins/nicira/QuantumPlugin.py:1473
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1488
+#: quantum/plugins/nicira/QuantumPlugin.py:1493
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1492
+#: quantum/plugins/nicira/QuantumPlugin.py:1497
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1513
+#: quantum/plugins/nicira/QuantumPlugin.py:1518
 #, python-format
 msgid ""
 "Current router status:%(router_status)s;Status in Quantum "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1521
+#: quantum/plugins/nicira/QuantumPlugin.py:1526
 msgid "Unable to get logical router"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1544
+#: quantum/plugins/nicira/QuantumPlugin.py:1549
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1566
+#: quantum/plugins/nicira/QuantumPlugin.py:1571
 #, python-format
 msgid ""
 "Found %s logical routers not bound to Quantum routers. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1593
+#: quantum/plugins/nicira/QuantumPlugin.py:1598
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1628
+#: quantum/plugins/nicira/QuantumPlugin.py:1633
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1673
+#: quantum/plugins/nicira/QuantumPlugin.py:1678
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1685
+#: quantum/plugins/nicira/QuantumPlugin.py:1690
 #, python-format
 msgid ""
 "Unable to find NVP logical router port for Quantum port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1714
+#: quantum/plugins/nicira/QuantumPlugin.py:1719
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1740
+#: quantum/plugins/nicira/QuantumPlugin.py:1745
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1746
+#: quantum/plugins/nicira/QuantumPlugin.py:1751
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1812
+#: quantum/plugins/nicira/QuantumPlugin.py:1817
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1836
+#: quantum/plugins/nicira/QuantumPlugin.py:1841
 #, python-format
 msgid ""
 "An error occurred while creating NAT rules on the NVP platform for "
 "floating ip:%(floating_ip)s mapped to internal ip:%(internal_ip)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1878
+#: quantum/plugins/nicira/QuantumPlugin.py:1883
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1881
+#: quantum/plugins/nicira/QuantumPlugin.py:1886
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1907
+#: quantum/plugins/nicira/QuantumPlugin.py:1912
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1929
+#: quantum/plugins/nicira/QuantumPlugin.py:1934
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
@@ -6536,69 +6560,69 @@ msgstr ""
 msgid "The network gateway %(gateway_id)s cannot be updated or deleted"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:152
+#: quantum/plugins/nicira/nicira_networkgw_db.py:160
 msgid ""
 "A network identifier must be specified when connecting a network to a "
 "network gateway. Unable to complete operation"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:158
+#: quantum/plugins/nicira/nicira_networkgw_db.py:166
 #, python-format
 msgid ""
 "Invalid keys found among the ones provided in request body: "
 "%(connection_attrs)s."
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:164
+#: quantum/plugins/nicira/nicira_networkgw_db.py:172
 msgid ""
 "In order to specify a segmentation id the segmentation type must be "
 "specified as well"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:168
+#: quantum/plugins/nicira/nicira_networkgw_db.py:176
 msgid "Cannot specify a segmentation id when the segmentation type is flat"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:217
+#: quantum/plugins/nicira/nicira_networkgw_db.py:225
 #, python-format
 msgid "Created network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:230
+#: quantum/plugins/nicira/nicira_networkgw_db.py:237
 #, python-format
 msgid "Updated network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:245
+#: quantum/plugins/nicira/nicira_networkgw_db.py:252
 #, python-format
 msgid "Network gateway '%s' was destroyed."
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:255
+#: quantum/plugins/nicira/nicira_networkgw_db.py:262
 #, python-format
 msgid "Connecting network '%(network_id)s' to gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:296
+#: quantum/plugins/nicira/nicira_networkgw_db.py:303
 #, python-format
 msgid ""
 "Requested network '%(network_id)s' not found.Unable to create network "
 "connection on gateway '%(network_gateway_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:304
+#: quantum/plugins/nicira/nicira_networkgw_db.py:311
 #, python-format
 msgid ""
 "Gateway port for '%(network_gateway_id)s' created on network "
 "'%(network_id)s':%(port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:320
+#: quantum/plugins/nicira/nicira_networkgw_db.py:327
 #, python-format
 msgid "Ensured no Ip addresses are configured on port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:330
+#: quantum/plugins/nicira/nicira_networkgw_db.py:337
 #, python-format
 msgid ""
 "Disconnecting network '%(network_id)s' from gateway "
@@ -7229,11 +7253,11 @@ msgid ""
 "router:'%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:63
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:66
 msgid "Cannot create a gateway with an empty device list"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:89
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:92
 msgid "number of network gateways allowed per tenant, -1 for unlimited"
 msgstr ""
 
@@ -7970,3 +7994,14 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
+#~ msgid "no calling threads waiting for msg_id : %s, message : %s"
+#~ msgstr ""
+
+#~ msgid "Matchmaker unregistered: %s, %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "RuleManager.create_for_sg_rule: adding accept rule"
+#~ " %(rule_id) in portgroup %(port_group_id)s"
+#~ msgstr ""
+

diff --git a/quantum/locale/pt_BR/LC_MESSAGES/quantum.po b/quantum/locale/pt_BR/LC_MESSAGES/quantum.po
index 1994550b5f0c0d16d3d66cfe70940bcf88cfc72e..584c6c8d2371905d89afb72a3b851511fe71a6f7 100644 (file)
--- a/quantum/locale/pt_BR/LC_MESSAGES/quantum.po
+++ b/quantum/locale/pt_BR/LC_MESSAGES/quantum.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-05-26 12:11+0000\n"
+"POT-Creation-Date: 2013-05-27 12:11+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Portuguese (Brazil) "
@@ -2235,7 +2235,7 @@ msgid ""
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:594 quantum/plugins/nicira/QuantumPlugin.py:1773
+#: quantum/db/l3_db.py:594 quantum/plugins/nicira/QuantumPlugin.py:1778
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
@@ -2808,7 +2808,7 @@ msgid "Was expecting a dict for service definition, found the following: %s"
 msgstr ""
 
 #: quantum/extensions/servicetype.py:160
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:83
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:86
 #, python-format
 msgid "%s: provided data are not iterable"
 msgstr ""
@@ -2832,47 +2832,47 @@ msgstr ""
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:98
+#: quantum/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:184
+#: quantum/openstack/common/lockutils.py:188
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:195
+#: quantum/openstack/common/lockutils.py:199
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:222
+#: quantum/openstack/common/lockutils.py:226
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:230
+#: quantum/openstack/common/lockutils.py:234
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/log.py:226
+#: quantum/openstack/common/log.py:244
 #, python-format
 msgid "Deprecated: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:329
+#: quantum/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:379
+#: quantum/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:537
+#: quantum/openstack/common/log.py:555
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2895,120 +2895,134 @@ msgstr ""
 msgid "in dynamic looping call"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:41
+#: quantum/openstack/common/periodic_task.py:42
 #, python-format
 msgid "Unexpected argument for periodic task creation: %(arg)s."
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:132
+#: quantum/openstack/common/periodic_task.py:133
 #, python-format
 msgid "Skipping periodic task %(task)s because its interval is negative"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:137
+#: quantum/openstack/common/periodic_task.py:138
 #, python-format
 msgid "Skipping periodic task %(task)s because it is disabled"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:175
+#: quantum/openstack/common/periodic_task.py:176
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:183
+#: quantum/openstack/common/periodic_task.py:184
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:394
+#: quantum/openstack/common/policy.py:395
 #, python-format
 msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:404
+#: quantum/openstack/common/policy.py:405
 #, python-format
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:679
+#: quantum/openstack/common/policy.py:680
 #, python-format
 msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:122
+#: quantum/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:137
+#: quantum/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:162
+#: quantum/openstack/common/processutils.py:167
+#: quantum/openstack/common/processutils.py:240
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:174
+#: quantum/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: quantum/openstack/common/service.py:112
-#: quantum/openstack/common/service.py:275
+#: quantum/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
+#: quantum/openstack/common/processutils.py:221
+msgid "Environment not supported over SSH"
+msgstr ""
+
+#: quantum/openstack/common/processutils.py:225
+msgid "process_input not supported over SSH"
+msgstr ""
+
+#: quantum/openstack/common/service.py:113
+#: quantum/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: quantum/openstack/common/service.py:121
-#: quantum/openstack/common/service.py:218
+#: quantum/openstack/common/service.py:122
+#: quantum/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:164
+#: quantum/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:200
+#: quantum/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: quantum/openstack/common/service.py:223
+#: quantum/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: quantum/openstack/common/service.py:230
+#: quantum/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:240
+#: quantum/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: quantum/openstack/common/service.py:257
+#: quantum/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:261
+#: quantum/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:265
+#: quantum/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
 
-#: quantum/openstack/common/service.py:293
+#: quantum/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: quantum/openstack/common/service.py:304
+#: quantum/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -3054,131 +3068,136 @@ msgstr ""
 
 #: quantum/openstack/common/rpc/amqp.py:200
 #, python-format
-msgid "no calling threads waiting for msg_id : %s, message : %s"
+msgid "no calling threads waiting for msg_id : %(msg_id)s, message : %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:208
+#: quantum/openstack/common/rpc/amqp.py:209
 #, python-format
 msgid ""
 "Number of call waiters is greater than warning threshhold: %d. There "
 "could be a MulticallProxyWaiter leak."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:291
+#: quantum/openstack/common/rpc/amqp.py:292
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:337
+#: quantum/openstack/common/rpc/amqp.py:338
 #, python-format
 msgid "UNIQUE_ID is %s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:406
+#: quantum/openstack/common/rpc/amqp.py:407
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:414
+#: quantum/openstack/common/rpc/amqp.py:415
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:415
+#: quantum/openstack/common/rpc/amqp.py:416
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:443
+#: quantum/openstack/common/rpc/amqp.py:444
 #: quantum/openstack/common/rpc/impl_zmq.py:286
 #, python-format
 msgid "Expected exception during message handling (%s)"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:451
+#: quantum/openstack/common/rpc/amqp.py:452
 #: quantum/openstack/common/rpc/impl_zmq.py:292
 msgid "Exception during message handling"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:586
+#: quantum/openstack/common/rpc/amqp.py:587
 #, python-format
 msgid "Making synchronous call on %s ..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:589
+#: quantum/openstack/common/rpc/amqp.py:590
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:623
+#: quantum/openstack/common/rpc/amqp.py:624
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:632
+#: quantum/openstack/common/rpc/amqp.py:633
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:660
+#: quantum/openstack/common/rpc/amqp.py:661
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:74
+#: quantum/openstack/common/rpc/common.py:75
 msgid "An unknown RPC related exception occurred."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:86
+#: quantum/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:104
+#: quantum/openstack/common/rpc/common.py:105
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:121
+#: quantum/openstack/common/rpc/common.py:122
 #, python-format
 msgid ""
 "Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:"
 " \"%(method)s\" info: \"%(info)s\""
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:137
 #: quantum/openstack/common/rpc/common.py:138
 #: quantum/openstack/common/rpc/common.py:139
+#: quantum/openstack/common/rpc/common.py:140
 msgid "<unknown>"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:143
+#: quantum/openstack/common/rpc/common.py:144
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:147
+#: quantum/openstack/common/rpc/common.py:148
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:151
+#: quantum/openstack/common/rpc/common.py:152
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:156
+#: quantum/openstack/common/rpc/common.py:157
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:280
+#: quantum/openstack/common/rpc/common.py:162
+#, python-format
+msgid "Specified RPC version cap, %(version_cap)s, is too low"
+msgstr ""
+
+#: quantum/openstack/common/rpc/common.py:285
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:302
+#: quantum/openstack/common/rpc/common.py:307
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
@@ -3441,25 +3460,30 @@ msgstr ""
 msgid "No match from matchmaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:53
+#: quantum/openstack/common/rpc/impl_zmq.py:852
+#, python-format
+msgid "rpc_zmq_matchmaker = %(orig)s is deprecated; use %(new)s instead"
+msgstr ""
+
+#: quantum/openstack/common/rpc/matchmaker.py:47
 msgid "Match not found by MatchMaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:89
+#: quantum/openstack/common/rpc/matchmaker.py:83
 msgid "Matchmaker does not implement registration or heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:239
+#: quantum/openstack/common/rpc/matchmaker.py:233
 #, python-format
-msgid "Matchmaker unregistered: %s, %s"
+msgid "Matchmaker unregistered: %(key)s, %(host)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:250
+#: quantum/openstack/common/rpc/matchmaker.py:245
 msgid "Register before starting heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:343
-#: quantum/openstack/common/rpc/matchmaker.py:361
+#: quantum/openstack/common/rpc/matchmaker_ring.py:81
+#: quantum/openstack/common/rpc/matchmaker_ring.py:99
 #, python-format
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
@@ -5124,7 +5148,7 @@ msgstr ""
 #: quantum/plugins/midonet/midonet_lib.py:278
 #, python-format
 msgid ""
-"RuleManager.create_for_sg_rule: adding accept rule %(rule_id) in "
+"RuleManager.create_for_sg_rule: adding accept rule %(rule_id)s in "
 "portgroup %(port_group_id)s"
 msgstr ""
 
@@ -5222,7 +5246,7 @@ msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
 #: quantum/plugins/midonet/plugin.py:319
-#: quantum/plugins/nicira/QuantumPlugin.py:1025
+#: quantum/plugins/nicira/QuantumPlugin.py:1030
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
@@ -6089,408 +6113,408 @@ msgstr ""
 msgid "The request has timed out."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:223
+#: quantum/plugins/nicira/QuantumPlugin.py:228
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:258
+#: quantum/plugins/nicira/QuantumPlugin.py:263
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:260
+#: quantum/plugins/nicira/QuantumPlugin.py:265
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:263
+#: quantum/plugins/nicira/QuantumPlugin.py:268
 #, python-format
 msgid ""
 "Unable to create logical router port for quantum port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:285
+#: quantum/plugins/nicira/QuantumPlugin.py:290
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:291
+#: quantum/plugins/nicira/QuantumPlugin.py:296
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
 "associated with Quantum %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:297
+#: quantum/plugins/nicira/QuantumPlugin.py:302
 #, python-format
 msgid ""
 "Unable to plug attachment in router port %(r_port_id)s for quantum port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:342
+#: quantum/plugins/nicira/QuantumPlugin.py:347
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:367
-#: quantum/plugins/nicira/QuantumPlugin.py:402
-#: quantum/plugins/nicira/QuantumPlugin.py:592
+#: quantum/plugins/nicira/QuantumPlugin.py:372
+#: quantum/plugins/nicira/QuantumPlugin.py:407
+#: quantum/plugins/nicira/QuantumPlugin.py:597
 #, python-format
 msgid ""
 "NVP plugin does not support regular VIF ports on external networks. Port "
 "%s will be down."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:387
-#: quantum/plugins/nicira/QuantumPlugin.py:468
-#: quantum/plugins/nicira/QuantumPlugin.py:612
+#: quantum/plugins/nicira/QuantumPlugin.py:392
+#: quantum/plugins/nicira/QuantumPlugin.py:473
+#: quantum/plugins/nicira/QuantumPlugin.py:617
 #, python-format
 msgid ""
 "_nvp_create_port completed for port %(name)s on network %(network_id)s. "
 "The new port id is %(id)s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:391
+#: quantum/plugins/nicira/QuantumPlugin.py:396
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:409
+#: quantum/plugins/nicira/QuantumPlugin.py:414
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:418
+#: quantum/plugins/nicira/QuantumPlugin.py:423
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:424
+#: quantum/plugins/nicira/QuantumPlugin.py:429
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:443
-#: quantum/plugins/nicira/QuantumPlugin.py:876
+#: quantum/plugins/nicira/QuantumPlugin.py:448
+#: quantum/plugins/nicira/QuantumPlugin.py:881
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:455
+#: quantum/plugins/nicira/QuantumPlugin.py:460
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:473
+#: quantum/plugins/nicira/QuantumPlugin.py:478
 msgid "An exception occured while plugging the interface"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:481
+#: quantum/plugins/nicira/QuantumPlugin.py:486
 #, python-format
 msgid ""
 "device_id field must be populated in order to create an external gateway "
 "port for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:489
+#: quantum/plugins/nicira/QuantumPlugin.py:494
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:535
+#: quantum/plugins/nicira/QuantumPlugin.py:540
 #, python-format
 msgid ""
 "_nvp_create_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s. NVP port id is %(nvp_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:573
+#: quantum/plugins/nicira/QuantumPlugin.py:578
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:577
-#: quantum/plugins/nicira/QuantumPlugin.py:1718
+#: quantum/plugins/nicira/QuantumPlugin.py:582
+#: quantum/plugins/nicira/QuantumPlugin.py:1723
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:579
+#: quantum/plugins/nicira/QuantumPlugin.py:584
 #, python-format
 msgid ""
 "_nvp_delete_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:617
+#: quantum/plugins/nicira/QuantumPlugin.py:622
 #, python-format
 msgid "An exception occured while plugging the gateway interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:657
+#: quantum/plugins/nicira/QuantumPlugin.py:662
 #, python-format
 msgid "Unable to find NVP uuid for Quantum port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:686
+#: quantum/plugins/nicira/QuantumPlugin.py:691
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:690
+#: quantum/plugins/nicira/QuantumPlugin.py:695
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:694
+#: quantum/plugins/nicira/QuantumPlugin.py:699
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:698
-#: quantum/plugins/nicira/QuantumPlugin.py:713
+#: quantum/plugins/nicira/QuantumPlugin.py:703
+#: quantum/plugins/nicira/QuantumPlugin.py:718
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:719
+#: quantum/plugins/nicira/QuantumPlugin.py:724
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:750
+#: quantum/plugins/nicira/QuantumPlugin.py:755
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:772
+#: quantum/plugins/nicira/QuantumPlugin.py:777
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:799
+#: quantum/plugins/nicira/QuantumPlugin.py:804
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not yet supported by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:858
+#: quantum/plugins/nicira/QuantumPlugin.py:863
 #, python-format
 msgid "A nvp lport identifier was not found for quantum port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:886
+#: quantum/plugins/nicira/QuantumPlugin.py:891
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:889
+#: quantum/plugins/nicira/QuantumPlugin.py:894
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:915
+#: quantum/plugins/nicira/QuantumPlugin.py:920
 #, python-format
 msgid ""
 "Current network status:%(nvp_net_status)s; Status in Quantum "
 "DB:%(quantum_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:925
-#: quantum/plugins/nicira/QuantumPlugin.py:975
+#: quantum/plugins/nicira/QuantumPlugin.py:930
+#: quantum/plugins/nicira/QuantumPlugin.py:980
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:989
+#: quantum/plugins/nicira/QuantumPlugin.py:994
 #, python-format
 msgid "Logical Switch %s found in quantum database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1004
+#: quantum/plugins/nicira/QuantumPlugin.py:1009
 #, python-format
 msgid ""
 "Found %s logical switches not bound to Quantum networks. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1008
+#: quantum/plugins/nicira/QuantumPlugin.py:1013
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1091
+#: quantum/plugins/nicira/QuantumPlugin.py:1096
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1100
+#: quantum/plugins/nicira/QuantumPlugin.py:1105
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1127
+#: quantum/plugins/nicira/QuantumPlugin.py:1132
 #, python-format
 msgid "Quantum logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1134
+#: quantum/plugins/nicira/QuantumPlugin.py:1139
 #, python-format
 msgid ""
 "Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1196
+#: quantum/plugins/nicira/QuantumPlugin.py:1201
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1202
+#: quantum/plugins/nicira/QuantumPlugin.py:1207
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1207
+#: quantum/plugins/nicira/QuantumPlugin.py:1212
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1271
+#: quantum/plugins/nicira/QuantumPlugin.py:1276
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1296
+#: quantum/plugins/nicira/QuantumPlugin.py:1301
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1410
-#: quantum/plugins/nicira/QuantumPlugin.py:1455
+#: quantum/plugins/nicira/QuantumPlugin.py:1415
+#: quantum/plugins/nicira/QuantumPlugin.py:1460
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1423
+#: quantum/plugins/nicira/QuantumPlugin.py:1428
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1465
+#: quantum/plugins/nicira/QuantumPlugin.py:1470
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1468
+#: quantum/plugins/nicira/QuantumPlugin.py:1473
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1488
+#: quantum/plugins/nicira/QuantumPlugin.py:1493
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1492
+#: quantum/plugins/nicira/QuantumPlugin.py:1497
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1513
+#: quantum/plugins/nicira/QuantumPlugin.py:1518
 #, python-format
 msgid ""
 "Current router status:%(router_status)s;Status in Quantum "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1521
+#: quantum/plugins/nicira/QuantumPlugin.py:1526
 msgid "Unable to get logical router"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1544
+#: quantum/plugins/nicira/QuantumPlugin.py:1549
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1566
+#: quantum/plugins/nicira/QuantumPlugin.py:1571
 #, python-format
 msgid ""
 "Found %s logical routers not bound to Quantum routers. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1593
+#: quantum/plugins/nicira/QuantumPlugin.py:1598
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1628
+#: quantum/plugins/nicira/QuantumPlugin.py:1633
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1673
+#: quantum/plugins/nicira/QuantumPlugin.py:1678
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1685
+#: quantum/plugins/nicira/QuantumPlugin.py:1690
 #, python-format
 msgid ""
 "Unable to find NVP logical router port for Quantum port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1714
+#: quantum/plugins/nicira/QuantumPlugin.py:1719
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1740
+#: quantum/plugins/nicira/QuantumPlugin.py:1745
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1746
+#: quantum/plugins/nicira/QuantumPlugin.py:1751
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1812
+#: quantum/plugins/nicira/QuantumPlugin.py:1817
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1836
+#: quantum/plugins/nicira/QuantumPlugin.py:1841
 #, python-format
 msgid ""
 "An error occurred while creating NAT rules on the NVP platform for "
 "floating ip:%(floating_ip)s mapped to internal ip:%(internal_ip)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1878
+#: quantum/plugins/nicira/QuantumPlugin.py:1883
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1881
+#: quantum/plugins/nicira/QuantumPlugin.py:1886
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1907
+#: quantum/plugins/nicira/QuantumPlugin.py:1912
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1929
+#: quantum/plugins/nicira/QuantumPlugin.py:1934
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
@@ -6536,69 +6560,69 @@ msgstr ""
 msgid "The network gateway %(gateway_id)s cannot be updated or deleted"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:152
+#: quantum/plugins/nicira/nicira_networkgw_db.py:160
 msgid ""
 "A network identifier must be specified when connecting a network to a "
 "network gateway. Unable to complete operation"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:158
+#: quantum/plugins/nicira/nicira_networkgw_db.py:166
 #, python-format
 msgid ""
 "Invalid keys found among the ones provided in request body: "
 "%(connection_attrs)s."
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:164
+#: quantum/plugins/nicira/nicira_networkgw_db.py:172
 msgid ""
 "In order to specify a segmentation id the segmentation type must be "
 "specified as well"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:168
+#: quantum/plugins/nicira/nicira_networkgw_db.py:176
 msgid "Cannot specify a segmentation id when the segmentation type is flat"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:217
+#: quantum/plugins/nicira/nicira_networkgw_db.py:225
 #, python-format
 msgid "Created network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:230
+#: quantum/plugins/nicira/nicira_networkgw_db.py:237
 #, python-format
 msgid "Updated network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:245
+#: quantum/plugins/nicira/nicira_networkgw_db.py:252
 #, python-format
 msgid "Network gateway '%s' was destroyed."
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:255
+#: quantum/plugins/nicira/nicira_networkgw_db.py:262
 #, python-format
 msgid "Connecting network '%(network_id)s' to gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:296
+#: quantum/plugins/nicira/nicira_networkgw_db.py:303
 #, python-format
 msgid ""
 "Requested network '%(network_id)s' not found.Unable to create network "
 "connection on gateway '%(network_gateway_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:304
+#: quantum/plugins/nicira/nicira_networkgw_db.py:311
 #, python-format
 msgid ""
 "Gateway port for '%(network_gateway_id)s' created on network "
 "'%(network_id)s':%(port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:320
+#: quantum/plugins/nicira/nicira_networkgw_db.py:327
 #, python-format
 msgid "Ensured no Ip addresses are configured on port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:330
+#: quantum/plugins/nicira/nicira_networkgw_db.py:337
 #, python-format
 msgid ""
 "Disconnecting network '%(network_id)s' from gateway "
@@ -7229,11 +7253,11 @@ msgid ""
 "router:'%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:63
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:66
 msgid "Cannot create a gateway with an empty device list"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:89
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:92
 msgid "number of network gateways allowed per tenant, -1 for unlimited"
 msgstr ""
 
@@ -7970,3 +7994,14 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
+#~ msgid "no calling threads waiting for msg_id : %s, message : %s"
+#~ msgstr ""
+
+#~ msgid "Matchmaker unregistered: %s, %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "RuleManager.create_for_sg_rule: adding accept rule"
+#~ " %(rule_id) in portgroup %(port_group_id)s"
+#~ msgstr ""
+

diff --git a/quantum/locale/quantum.pot b/quantum/locale/quantum.pot
index 3c99de372c896853be27392793a69a5588026ecd..e8fd02d2614053638a130ee8a801f219d257d07e 100644 (file)
--- a/quantum/locale/quantum.pot
+++ b/quantum/locale/quantum.pot
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: quantum "
-"jenkins.quantum.propose.translation.update.118\n"
+"jenkins.quantum.propose.translation.update.119\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-05-26 12:11+0000\n"
+"POT-Creation-Date: 2013-05-27 12: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"
@@ -2235,7 +2235,7 @@ msgid ""
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:594 quantum/plugins/nicira/QuantumPlugin.py:1773
+#: quantum/db/l3_db.py:594 quantum/plugins/nicira/QuantumPlugin.py:1778
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
@@ -2808,7 +2808,7 @@ msgid "Was expecting a dict for service definition, found the following: %s"
 msgstr ""
 
 #: quantum/extensions/servicetype.py:160
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:83
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:86
 #, python-format
 msgid "%s: provided data are not iterable"
 msgstr ""
@@ -2832,47 +2832,47 @@ msgstr ""
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:98
+#: quantum/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:184
+#: quantum/openstack/common/lockutils.py:188
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:195
+#: quantum/openstack/common/lockutils.py:199
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:222
+#: quantum/openstack/common/lockutils.py:226
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:230
+#: quantum/openstack/common/lockutils.py:234
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/log.py:226
+#: quantum/openstack/common/log.py:244
 #, python-format
 msgid "Deprecated: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:329
+#: quantum/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:379
+#: quantum/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:537
+#: quantum/openstack/common/log.py:555
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2895,120 +2895,134 @@ msgstr ""
 msgid "in dynamic looping call"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:41
+#: quantum/openstack/common/periodic_task.py:42
 #, python-format
 msgid "Unexpected argument for periodic task creation: %(arg)s."
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:132
+#: quantum/openstack/common/periodic_task.py:133
 #, python-format
 msgid "Skipping periodic task %(task)s because its interval is negative"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:137
+#: quantum/openstack/common/periodic_task.py:138
 #, python-format
 msgid "Skipping periodic task %(task)s because it is disabled"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:175
+#: quantum/openstack/common/periodic_task.py:176
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:183
+#: quantum/openstack/common/periodic_task.py:184
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:394
+#: quantum/openstack/common/policy.py:395
 #, python-format
 msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:404
+#: quantum/openstack/common/policy.py:405
 #, python-format
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:679
+#: quantum/openstack/common/policy.py:680
 #, python-format
 msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:122
+#: quantum/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:137
+#: quantum/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:162
+#: quantum/openstack/common/processutils.py:167
+#: quantum/openstack/common/processutils.py:240
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:174
+#: quantum/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: quantum/openstack/common/service.py:112
-#: quantum/openstack/common/service.py:275
+#: quantum/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
+#: quantum/openstack/common/processutils.py:221
+msgid "Environment not supported over SSH"
+msgstr ""
+
+#: quantum/openstack/common/processutils.py:225
+msgid "process_input not supported over SSH"
+msgstr ""
+
+#: quantum/openstack/common/service.py:113
+#: quantum/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: quantum/openstack/common/service.py:121
-#: quantum/openstack/common/service.py:218
+#: quantum/openstack/common/service.py:122
+#: quantum/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:164
+#: quantum/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:200
+#: quantum/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: quantum/openstack/common/service.py:223
+#: quantum/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: quantum/openstack/common/service.py:230
+#: quantum/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:240
+#: quantum/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: quantum/openstack/common/service.py:257
+#: quantum/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:261
+#: quantum/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:265
+#: quantum/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
 
-#: quantum/openstack/common/service.py:293
+#: quantum/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: quantum/openstack/common/service.py:304
+#: quantum/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -3054,131 +3068,136 @@ msgstr ""
 
 #: quantum/openstack/common/rpc/amqp.py:200
 #, python-format
-msgid "no calling threads waiting for msg_id : %s, message : %s"
+msgid "no calling threads waiting for msg_id : %(msg_id)s, message : %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:208
+#: quantum/openstack/common/rpc/amqp.py:209
 #, python-format
 msgid ""
 "Number of call waiters is greater than warning threshhold: %d. There "
 "could be a MulticallProxyWaiter leak."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:291
+#: quantum/openstack/common/rpc/amqp.py:292
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:337
+#: quantum/openstack/common/rpc/amqp.py:338
 #, python-format
 msgid "UNIQUE_ID is %s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:406
+#: quantum/openstack/common/rpc/amqp.py:407
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:414
+#: quantum/openstack/common/rpc/amqp.py:415
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:415
+#: quantum/openstack/common/rpc/amqp.py:416
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:443
+#: quantum/openstack/common/rpc/amqp.py:444
 #: quantum/openstack/common/rpc/impl_zmq.py:286
 #, python-format
 msgid "Expected exception during message handling (%s)"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:451
+#: quantum/openstack/common/rpc/amqp.py:452
 #: quantum/openstack/common/rpc/impl_zmq.py:292
 msgid "Exception during message handling"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:586
+#: quantum/openstack/common/rpc/amqp.py:587
 #, python-format
 msgid "Making synchronous call on %s ..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:589
+#: quantum/openstack/common/rpc/amqp.py:590
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:623
+#: quantum/openstack/common/rpc/amqp.py:624
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:632
+#: quantum/openstack/common/rpc/amqp.py:633
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:660
+#: quantum/openstack/common/rpc/amqp.py:661
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:74
+#: quantum/openstack/common/rpc/common.py:75
 msgid "An unknown RPC related exception occurred."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:86
+#: quantum/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:104
+#: quantum/openstack/common/rpc/common.py:105
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:121
+#: quantum/openstack/common/rpc/common.py:122
 #, python-format
 msgid ""
 "Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:"
 " \"%(method)s\" info: \"%(info)s\""
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:137
 #: quantum/openstack/common/rpc/common.py:138
 #: quantum/openstack/common/rpc/common.py:139
+#: quantum/openstack/common/rpc/common.py:140
 msgid "<unknown>"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:143
+#: quantum/openstack/common/rpc/common.py:144
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:147
+#: quantum/openstack/common/rpc/common.py:148
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:151
+#: quantum/openstack/common/rpc/common.py:152
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:156
+#: quantum/openstack/common/rpc/common.py:157
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:280
+#: quantum/openstack/common/rpc/common.py:162
+#, python-format
+msgid "Specified RPC version cap, %(version_cap)s, is too low"
+msgstr ""
+
+#: quantum/openstack/common/rpc/common.py:285
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:302
+#: quantum/openstack/common/rpc/common.py:307
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
@@ -3441,25 +3460,30 @@ msgstr ""
 msgid "No match from matchmaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:53
+#: quantum/openstack/common/rpc/impl_zmq.py:852
+#, python-format
+msgid "rpc_zmq_matchmaker = %(orig)s is deprecated; use %(new)s instead"
+msgstr ""
+
+#: quantum/openstack/common/rpc/matchmaker.py:47
 msgid "Match not found by MatchMaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:89
+#: quantum/openstack/common/rpc/matchmaker.py:83
 msgid "Matchmaker does not implement registration or heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:239
+#: quantum/openstack/common/rpc/matchmaker.py:233
 #, python-format
-msgid "Matchmaker unregistered: %s, %s"
+msgid "Matchmaker unregistered: %(key)s, %(host)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:250
+#: quantum/openstack/common/rpc/matchmaker.py:245
 msgid "Register before starting heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:343
-#: quantum/openstack/common/rpc/matchmaker.py:361
+#: quantum/openstack/common/rpc/matchmaker_ring.py:81
+#: quantum/openstack/common/rpc/matchmaker_ring.py:99
 #, python-format
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
@@ -5124,7 +5148,7 @@ msgstr ""
 #: quantum/plugins/midonet/midonet_lib.py:278
 #, python-format
 msgid ""
-"RuleManager.create_for_sg_rule: adding accept rule %(rule_id) in "
+"RuleManager.create_for_sg_rule: adding accept rule %(rule_id)s in "
 "portgroup %(port_group_id)s"
 msgstr ""
 
@@ -5222,7 +5246,7 @@ msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
 #: quantum/plugins/midonet/plugin.py:319
-#: quantum/plugins/nicira/QuantumPlugin.py:1025
+#: quantum/plugins/nicira/QuantumPlugin.py:1030
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
@@ -6089,408 +6113,408 @@ msgstr ""
 msgid "The request has timed out."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:223
+#: quantum/plugins/nicira/QuantumPlugin.py:228
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:258
+#: quantum/plugins/nicira/QuantumPlugin.py:263
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:260
+#: quantum/plugins/nicira/QuantumPlugin.py:265
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:263
+#: quantum/plugins/nicira/QuantumPlugin.py:268
 #, python-format
 msgid ""
 "Unable to create logical router port for quantum port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:285
+#: quantum/plugins/nicira/QuantumPlugin.py:290
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:291
+#: quantum/plugins/nicira/QuantumPlugin.py:296
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
 "associated with Quantum %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:297
+#: quantum/plugins/nicira/QuantumPlugin.py:302
 #, python-format
 msgid ""
 "Unable to plug attachment in router port %(r_port_id)s for quantum port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:342
+#: quantum/plugins/nicira/QuantumPlugin.py:347
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:367
-#: quantum/plugins/nicira/QuantumPlugin.py:402
-#: quantum/plugins/nicira/QuantumPlugin.py:592
+#: quantum/plugins/nicira/QuantumPlugin.py:372
+#: quantum/plugins/nicira/QuantumPlugin.py:407
+#: quantum/plugins/nicira/QuantumPlugin.py:597
 #, python-format
 msgid ""
 "NVP plugin does not support regular VIF ports on external networks. Port "
 "%s will be down."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:387
-#: quantum/plugins/nicira/QuantumPlugin.py:468
-#: quantum/plugins/nicira/QuantumPlugin.py:612
+#: quantum/plugins/nicira/QuantumPlugin.py:392
+#: quantum/plugins/nicira/QuantumPlugin.py:473
+#: quantum/plugins/nicira/QuantumPlugin.py:617
 #, python-format
 msgid ""
 "_nvp_create_port completed for port %(name)s on network %(network_id)s. "
 "The new port id is %(id)s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:391
+#: quantum/plugins/nicira/QuantumPlugin.py:396
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:409
+#: quantum/plugins/nicira/QuantumPlugin.py:414
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:418
+#: quantum/plugins/nicira/QuantumPlugin.py:423
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:424
+#: quantum/plugins/nicira/QuantumPlugin.py:429
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:443
-#: quantum/plugins/nicira/QuantumPlugin.py:876
+#: quantum/plugins/nicira/QuantumPlugin.py:448
+#: quantum/plugins/nicira/QuantumPlugin.py:881
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:455
+#: quantum/plugins/nicira/QuantumPlugin.py:460
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:473
+#: quantum/plugins/nicira/QuantumPlugin.py:478
 msgid "An exception occured while plugging the interface"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:481
+#: quantum/plugins/nicira/QuantumPlugin.py:486
 #, python-format
 msgid ""
 "device_id field must be populated in order to create an external gateway "
 "port for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:489
+#: quantum/plugins/nicira/QuantumPlugin.py:494
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:535
+#: quantum/plugins/nicira/QuantumPlugin.py:540
 #, python-format
 msgid ""
 "_nvp_create_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s. NVP port id is %(nvp_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:573
+#: quantum/plugins/nicira/QuantumPlugin.py:578
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:577
-#: quantum/plugins/nicira/QuantumPlugin.py:1718
+#: quantum/plugins/nicira/QuantumPlugin.py:582
+#: quantum/plugins/nicira/QuantumPlugin.py:1723
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:579
+#: quantum/plugins/nicira/QuantumPlugin.py:584
 #, python-format
 msgid ""
 "_nvp_delete_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:617
+#: quantum/plugins/nicira/QuantumPlugin.py:622
 #, python-format
 msgid "An exception occured while plugging the gateway interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:657
+#: quantum/plugins/nicira/QuantumPlugin.py:662
 #, python-format
 msgid "Unable to find NVP uuid for Quantum port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:686
+#: quantum/plugins/nicira/QuantumPlugin.py:691
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:690
+#: quantum/plugins/nicira/QuantumPlugin.py:695
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:694
+#: quantum/plugins/nicira/QuantumPlugin.py:699
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:698
-#: quantum/plugins/nicira/QuantumPlugin.py:713
+#: quantum/plugins/nicira/QuantumPlugin.py:703
+#: quantum/plugins/nicira/QuantumPlugin.py:718
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:719
+#: quantum/plugins/nicira/QuantumPlugin.py:724
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:750
+#: quantum/plugins/nicira/QuantumPlugin.py:755
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:772
+#: quantum/plugins/nicira/QuantumPlugin.py:777
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:799
+#: quantum/plugins/nicira/QuantumPlugin.py:804
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not yet supported by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:858
+#: quantum/plugins/nicira/QuantumPlugin.py:863
 #, python-format
 msgid "A nvp lport identifier was not found for quantum port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:886
+#: quantum/plugins/nicira/QuantumPlugin.py:891
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:889
+#: quantum/plugins/nicira/QuantumPlugin.py:894
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:915
+#: quantum/plugins/nicira/QuantumPlugin.py:920
 #, python-format
 msgid ""
 "Current network status:%(nvp_net_status)s; Status in Quantum "
 "DB:%(quantum_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:925
-#: quantum/plugins/nicira/QuantumPlugin.py:975
+#: quantum/plugins/nicira/QuantumPlugin.py:930
+#: quantum/plugins/nicira/QuantumPlugin.py:980
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:989
+#: quantum/plugins/nicira/QuantumPlugin.py:994
 #, python-format
 msgid "Logical Switch %s found in quantum database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1004
+#: quantum/plugins/nicira/QuantumPlugin.py:1009
 #, python-format
 msgid ""
 "Found %s logical switches not bound to Quantum networks. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1008
+#: quantum/plugins/nicira/QuantumPlugin.py:1013
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1091
+#: quantum/plugins/nicira/QuantumPlugin.py:1096
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1100
+#: quantum/plugins/nicira/QuantumPlugin.py:1105
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1127
+#: quantum/plugins/nicira/QuantumPlugin.py:1132
 #, python-format
 msgid "Quantum logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1134
+#: quantum/plugins/nicira/QuantumPlugin.py:1139
 #, python-format
 msgid ""
 "Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1196
+#: quantum/plugins/nicira/QuantumPlugin.py:1201
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1202
+#: quantum/plugins/nicira/QuantumPlugin.py:1207
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1207
+#: quantum/plugins/nicira/QuantumPlugin.py:1212
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1271
+#: quantum/plugins/nicira/QuantumPlugin.py:1276
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1296
+#: quantum/plugins/nicira/QuantumPlugin.py:1301
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1410
-#: quantum/plugins/nicira/QuantumPlugin.py:1455
+#: quantum/plugins/nicira/QuantumPlugin.py:1415
+#: quantum/plugins/nicira/QuantumPlugin.py:1460
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1423
+#: quantum/plugins/nicira/QuantumPlugin.py:1428
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1465
+#: quantum/plugins/nicira/QuantumPlugin.py:1470
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1468
+#: quantum/plugins/nicira/QuantumPlugin.py:1473
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1488
+#: quantum/plugins/nicira/QuantumPlugin.py:1493
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1492
+#: quantum/plugins/nicira/QuantumPlugin.py:1497
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1513
+#: quantum/plugins/nicira/QuantumPlugin.py:1518
 #, python-format
 msgid ""
 "Current router status:%(router_status)s;Status in Quantum "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1521
+#: quantum/plugins/nicira/QuantumPlugin.py:1526
 msgid "Unable to get logical router"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1544
+#: quantum/plugins/nicira/QuantumPlugin.py:1549
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1566
+#: quantum/plugins/nicira/QuantumPlugin.py:1571
 #, python-format
 msgid ""
 "Found %s logical routers not bound to Quantum routers. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1593
+#: quantum/plugins/nicira/QuantumPlugin.py:1598
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1628
+#: quantum/plugins/nicira/QuantumPlugin.py:1633
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1673
+#: quantum/plugins/nicira/QuantumPlugin.py:1678
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1685
+#: quantum/plugins/nicira/QuantumPlugin.py:1690
 #, python-format
 msgid ""
 "Unable to find NVP logical router port for Quantum port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1714
+#: quantum/plugins/nicira/QuantumPlugin.py:1719
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1740
+#: quantum/plugins/nicira/QuantumPlugin.py:1745
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1746
+#: quantum/plugins/nicira/QuantumPlugin.py:1751
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1812
+#: quantum/plugins/nicira/QuantumPlugin.py:1817
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1836
+#: quantum/plugins/nicira/QuantumPlugin.py:1841
 #, python-format
 msgid ""
 "An error occurred while creating NAT rules on the NVP platform for "
 "floating ip:%(floating_ip)s mapped to internal ip:%(internal_ip)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1878
+#: quantum/plugins/nicira/QuantumPlugin.py:1883
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1881
+#: quantum/plugins/nicira/QuantumPlugin.py:1886
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1907
+#: quantum/plugins/nicira/QuantumPlugin.py:1912
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1929
+#: quantum/plugins/nicira/QuantumPlugin.py:1934
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
@@ -6536,69 +6560,69 @@ msgstr ""
 msgid "The network gateway %(gateway_id)s cannot be updated or deleted"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:152
+#: quantum/plugins/nicira/nicira_networkgw_db.py:160
 msgid ""
 "A network identifier must be specified when connecting a network to a "
 "network gateway. Unable to complete operation"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:158
+#: quantum/plugins/nicira/nicira_networkgw_db.py:166
 #, python-format
 msgid ""
 "Invalid keys found among the ones provided in request body: "
 "%(connection_attrs)s."
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:164
+#: quantum/plugins/nicira/nicira_networkgw_db.py:172
 msgid ""
 "In order to specify a segmentation id the segmentation type must be "
 "specified as well"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:168
+#: quantum/plugins/nicira/nicira_networkgw_db.py:176
 msgid "Cannot specify a segmentation id when the segmentation type is flat"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:217
+#: quantum/plugins/nicira/nicira_networkgw_db.py:225
 #, python-format
 msgid "Created network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:230
+#: quantum/plugins/nicira/nicira_networkgw_db.py:237
 #, python-format
 msgid "Updated network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:245
+#: quantum/plugins/nicira/nicira_networkgw_db.py:252
 #, python-format
 msgid "Network gateway '%s' was destroyed."
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:255
+#: quantum/plugins/nicira/nicira_networkgw_db.py:262
 #, python-format
 msgid "Connecting network '%(network_id)s' to gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:296
+#: quantum/plugins/nicira/nicira_networkgw_db.py:303
 #, python-format
 msgid ""
 "Requested network '%(network_id)s' not found.Unable to create network "
 "connection on gateway '%(network_gateway_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:304
+#: quantum/plugins/nicira/nicira_networkgw_db.py:311
 #, python-format
 msgid ""
 "Gateway port for '%(network_gateway_id)s' created on network "
 "'%(network_id)s':%(port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:320
+#: quantum/plugins/nicira/nicira_networkgw_db.py:327
 #, python-format
 msgid "Ensured no Ip addresses are configured on port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:330
+#: quantum/plugins/nicira/nicira_networkgw_db.py:337
 #, python-format
 msgid ""
 "Disconnecting network '%(network_id)s' from gateway "
@@ -7229,11 +7253,11 @@ msgid ""
 "router:'%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:63
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:66
 msgid "Cannot create a gateway with an empty device list"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:89
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:92
 msgid "number of network gateways allowed per tenant, -1 for unlimited"
 msgstr ""
 

diff --git a/quantum/locale/ru/LC_MESSAGES/quantum.po b/quantum/locale/ru/LC_MESSAGES/quantum.po
index 49de3965f1f6aa451ce59843902a88ced462f390..0227c952c1d4221d9c87b73f1f6a4e1dfddbfca4 100644 (file)
--- a/quantum/locale/ru/LC_MESSAGES/quantum.po
+++ b/quantum/locale/ru/LC_MESSAGES/quantum.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-05-26 12:11+0000\n"
+"POT-Creation-Date: 2013-05-27 12:11+0000\n"
 "PO-Revision-Date: 2013-05-13 06:01+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Russian "
@@ -2236,7 +2236,7 @@ msgid ""
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:594 quantum/plugins/nicira/QuantumPlugin.py:1773
+#: quantum/db/l3_db.py:594 quantum/plugins/nicira/QuantumPlugin.py:1778
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
@@ -2809,7 +2809,7 @@ msgid "Was expecting a dict for service definition, found the following: %s"
 msgstr ""
 
 #: quantum/extensions/servicetype.py:160
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:83
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:86
 #, python-format
 msgid "%s: provided data are not iterable"
 msgstr ""
@@ -2833,47 +2833,47 @@ msgstr ""
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:98
+#: quantum/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:184
+#: quantum/openstack/common/lockutils.py:188
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:195
+#: quantum/openstack/common/lockutils.py:199
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:222
+#: quantum/openstack/common/lockutils.py:226
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:230
+#: quantum/openstack/common/lockutils.py:234
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/log.py:226
+#: quantum/openstack/common/log.py:244
 #, python-format
 msgid "Deprecated: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:329
+#: quantum/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:379
+#: quantum/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:537
+#: quantum/openstack/common/log.py:555
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2896,120 +2896,134 @@ msgstr ""
 msgid "in dynamic looping call"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:41
+#: quantum/openstack/common/periodic_task.py:42
 #, python-format
 msgid "Unexpected argument for periodic task creation: %(arg)s."
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:132
+#: quantum/openstack/common/periodic_task.py:133
 #, python-format
 msgid "Skipping periodic task %(task)s because its interval is negative"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:137
+#: quantum/openstack/common/periodic_task.py:138
 #, python-format
 msgid "Skipping periodic task %(task)s because it is disabled"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:175
+#: quantum/openstack/common/periodic_task.py:176
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:183
+#: quantum/openstack/common/periodic_task.py:184
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:394
+#: quantum/openstack/common/policy.py:395
 #, python-format
 msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:404
+#: quantum/openstack/common/policy.py:405
 #, python-format
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:679
+#: quantum/openstack/common/policy.py:680
 #, python-format
 msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:122
+#: quantum/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:137
+#: quantum/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:162
+#: quantum/openstack/common/processutils.py:167
+#: quantum/openstack/common/processutils.py:240
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:174
+#: quantum/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: quantum/openstack/common/service.py:112
-#: quantum/openstack/common/service.py:275
+#: quantum/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
+#: quantum/openstack/common/processutils.py:221
+msgid "Environment not supported over SSH"
+msgstr ""
+
+#: quantum/openstack/common/processutils.py:225
+msgid "process_input not supported over SSH"
+msgstr ""
+
+#: quantum/openstack/common/service.py:113
+#: quantum/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: quantum/openstack/common/service.py:121
-#: quantum/openstack/common/service.py:218
+#: quantum/openstack/common/service.py:122
+#: quantum/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:164
+#: quantum/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:200
+#: quantum/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: quantum/openstack/common/service.py:223
+#: quantum/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: quantum/openstack/common/service.py:230
+#: quantum/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:240
+#: quantum/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: quantum/openstack/common/service.py:257
+#: quantum/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:261
+#: quantum/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:265
+#: quantum/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
 
-#: quantum/openstack/common/service.py:293
+#: quantum/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: quantum/openstack/common/service.py:304
+#: quantum/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -3055,131 +3069,136 @@ msgstr ""
 
 #: quantum/openstack/common/rpc/amqp.py:200
 #, python-format
-msgid "no calling threads waiting for msg_id : %s, message : %s"
+msgid "no calling threads waiting for msg_id : %(msg_id)s, message : %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:208
+#: quantum/openstack/common/rpc/amqp.py:209
 #, python-format
 msgid ""
 "Number of call waiters is greater than warning threshhold: %d. There "
 "could be a MulticallProxyWaiter leak."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:291
+#: quantum/openstack/common/rpc/amqp.py:292
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:337
+#: quantum/openstack/common/rpc/amqp.py:338
 #, python-format
 msgid "UNIQUE_ID is %s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:406
+#: quantum/openstack/common/rpc/amqp.py:407
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:414
+#: quantum/openstack/common/rpc/amqp.py:415
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:415
+#: quantum/openstack/common/rpc/amqp.py:416
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:443
+#: quantum/openstack/common/rpc/amqp.py:444
 #: quantum/openstack/common/rpc/impl_zmq.py:286
 #, python-format
 msgid "Expected exception during message handling (%s)"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:451
+#: quantum/openstack/common/rpc/amqp.py:452
 #: quantum/openstack/common/rpc/impl_zmq.py:292
 msgid "Exception during message handling"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:586
+#: quantum/openstack/common/rpc/amqp.py:587
 #, python-format
 msgid "Making synchronous call on %s ..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:589
+#: quantum/openstack/common/rpc/amqp.py:590
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:623
+#: quantum/openstack/common/rpc/amqp.py:624
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:632
+#: quantum/openstack/common/rpc/amqp.py:633
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:660
+#: quantum/openstack/common/rpc/amqp.py:661
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:74
+#: quantum/openstack/common/rpc/common.py:75
 msgid "An unknown RPC related exception occurred."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:86
+#: quantum/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:104
+#: quantum/openstack/common/rpc/common.py:105
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:121
+#: quantum/openstack/common/rpc/common.py:122
 #, python-format
 msgid ""
 "Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:"
 " \"%(method)s\" info: \"%(info)s\""
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:137
 #: quantum/openstack/common/rpc/common.py:138
 #: quantum/openstack/common/rpc/common.py:139
+#: quantum/openstack/common/rpc/common.py:140
 msgid "<unknown>"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:143
+#: quantum/openstack/common/rpc/common.py:144
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:147
+#: quantum/openstack/common/rpc/common.py:148
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:151
+#: quantum/openstack/common/rpc/common.py:152
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:156
+#: quantum/openstack/common/rpc/common.py:157
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:280
+#: quantum/openstack/common/rpc/common.py:162
+#, python-format
+msgid "Specified RPC version cap, %(version_cap)s, is too low"
+msgstr ""
+
+#: quantum/openstack/common/rpc/common.py:285
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:302
+#: quantum/openstack/common/rpc/common.py:307
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
@@ -3442,25 +3461,30 @@ msgstr ""
 msgid "No match from matchmaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:53
+#: quantum/openstack/common/rpc/impl_zmq.py:852
+#, python-format
+msgid "rpc_zmq_matchmaker = %(orig)s is deprecated; use %(new)s instead"
+msgstr ""
+
+#: quantum/openstack/common/rpc/matchmaker.py:47
 msgid "Match not found by MatchMaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:89
+#: quantum/openstack/common/rpc/matchmaker.py:83
 msgid "Matchmaker does not implement registration or heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:239
+#: quantum/openstack/common/rpc/matchmaker.py:233
 #, python-format
-msgid "Matchmaker unregistered: %s, %s"
+msgid "Matchmaker unregistered: %(key)s, %(host)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:250
+#: quantum/openstack/common/rpc/matchmaker.py:245
 msgid "Register before starting heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:343
-#: quantum/openstack/common/rpc/matchmaker.py:361
+#: quantum/openstack/common/rpc/matchmaker_ring.py:81
+#: quantum/openstack/common/rpc/matchmaker_ring.py:99
 #, python-format
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
@@ -5125,7 +5149,7 @@ msgstr ""
 #: quantum/plugins/midonet/midonet_lib.py:278
 #, python-format
 msgid ""
-"RuleManager.create_for_sg_rule: adding accept rule %(rule_id) in "
+"RuleManager.create_for_sg_rule: adding accept rule %(rule_id)s in "
 "portgroup %(port_group_id)s"
 msgstr ""
 
@@ -5223,7 +5247,7 @@ msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
 #: quantum/plugins/midonet/plugin.py:319
-#: quantum/plugins/nicira/QuantumPlugin.py:1025
+#: quantum/plugins/nicira/QuantumPlugin.py:1030
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
@@ -6090,408 +6114,408 @@ msgstr ""
 msgid "The request has timed out."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:223
+#: quantum/plugins/nicira/QuantumPlugin.py:228
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:258
+#: quantum/plugins/nicira/QuantumPlugin.py:263
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:260
+#: quantum/plugins/nicira/QuantumPlugin.py:265
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:263
+#: quantum/plugins/nicira/QuantumPlugin.py:268
 #, python-format
 msgid ""
 "Unable to create logical router port for quantum port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:285
+#: quantum/plugins/nicira/QuantumPlugin.py:290
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:291
+#: quantum/plugins/nicira/QuantumPlugin.py:296
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
 "associated with Quantum %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:297
+#: quantum/plugins/nicira/QuantumPlugin.py:302
 #, python-format
 msgid ""
 "Unable to plug attachment in router port %(r_port_id)s for quantum port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:342
+#: quantum/plugins/nicira/QuantumPlugin.py:347
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:367
-#: quantum/plugins/nicira/QuantumPlugin.py:402
-#: quantum/plugins/nicira/QuantumPlugin.py:592
+#: quantum/plugins/nicira/QuantumPlugin.py:372
+#: quantum/plugins/nicira/QuantumPlugin.py:407
+#: quantum/plugins/nicira/QuantumPlugin.py:597
 #, python-format
 msgid ""
 "NVP plugin does not support regular VIF ports on external networks. Port "
 "%s will be down."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:387
-#: quantum/plugins/nicira/QuantumPlugin.py:468
-#: quantum/plugins/nicira/QuantumPlugin.py:612
+#: quantum/plugins/nicira/QuantumPlugin.py:392
+#: quantum/plugins/nicira/QuantumPlugin.py:473
+#: quantum/plugins/nicira/QuantumPlugin.py:617
 #, python-format
 msgid ""
 "_nvp_create_port completed for port %(name)s on network %(network_id)s. "
 "The new port id is %(id)s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:391
+#: quantum/plugins/nicira/QuantumPlugin.py:396
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:409
+#: quantum/plugins/nicira/QuantumPlugin.py:414
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:418
+#: quantum/plugins/nicira/QuantumPlugin.py:423
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:424
+#: quantum/plugins/nicira/QuantumPlugin.py:429
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:443
-#: quantum/plugins/nicira/QuantumPlugin.py:876
+#: quantum/plugins/nicira/QuantumPlugin.py:448
+#: quantum/plugins/nicira/QuantumPlugin.py:881
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:455
+#: quantum/plugins/nicira/QuantumPlugin.py:460
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:473
+#: quantum/plugins/nicira/QuantumPlugin.py:478
 msgid "An exception occured while plugging the interface"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:481
+#: quantum/plugins/nicira/QuantumPlugin.py:486
 #, python-format
 msgid ""
 "device_id field must be populated in order to create an external gateway "
 "port for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:489
+#: quantum/plugins/nicira/QuantumPlugin.py:494
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:535
+#: quantum/plugins/nicira/QuantumPlugin.py:540
 #, python-format
 msgid ""
 "_nvp_create_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s. NVP port id is %(nvp_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:573
+#: quantum/plugins/nicira/QuantumPlugin.py:578
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:577
-#: quantum/plugins/nicira/QuantumPlugin.py:1718
+#: quantum/plugins/nicira/QuantumPlugin.py:582
+#: quantum/plugins/nicira/QuantumPlugin.py:1723
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:579
+#: quantum/plugins/nicira/QuantumPlugin.py:584
 #, python-format
 msgid ""
 "_nvp_delete_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:617
+#: quantum/plugins/nicira/QuantumPlugin.py:622
 #, python-format
 msgid "An exception occured while plugging the gateway interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:657
+#: quantum/plugins/nicira/QuantumPlugin.py:662
 #, python-format
 msgid "Unable to find NVP uuid for Quantum port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:686
+#: quantum/plugins/nicira/QuantumPlugin.py:691
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:690
+#: quantum/plugins/nicira/QuantumPlugin.py:695
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:694
+#: quantum/plugins/nicira/QuantumPlugin.py:699
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:698
-#: quantum/plugins/nicira/QuantumPlugin.py:713
+#: quantum/plugins/nicira/QuantumPlugin.py:703
+#: quantum/plugins/nicira/QuantumPlugin.py:718
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:719
+#: quantum/plugins/nicira/QuantumPlugin.py:724
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:750
+#: quantum/plugins/nicira/QuantumPlugin.py:755
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:772
+#: quantum/plugins/nicira/QuantumPlugin.py:777
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:799
+#: quantum/plugins/nicira/QuantumPlugin.py:804
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not yet supported by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:858
+#: quantum/plugins/nicira/QuantumPlugin.py:863
 #, python-format
 msgid "A nvp lport identifier was not found for quantum port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:886
+#: quantum/plugins/nicira/QuantumPlugin.py:891
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:889
+#: quantum/plugins/nicira/QuantumPlugin.py:894
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:915
+#: quantum/plugins/nicira/QuantumPlugin.py:920
 #, python-format
 msgid ""
 "Current network status:%(nvp_net_status)s; Status in Quantum "
 "DB:%(quantum_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:925
-#: quantum/plugins/nicira/QuantumPlugin.py:975
+#: quantum/plugins/nicira/QuantumPlugin.py:930
+#: quantum/plugins/nicira/QuantumPlugin.py:980
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:989
+#: quantum/plugins/nicira/QuantumPlugin.py:994
 #, python-format
 msgid "Logical Switch %s found in quantum database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1004
+#: quantum/plugins/nicira/QuantumPlugin.py:1009
 #, python-format
 msgid ""
 "Found %s logical switches not bound to Quantum networks. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1008
+#: quantum/plugins/nicira/QuantumPlugin.py:1013
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1091
+#: quantum/plugins/nicira/QuantumPlugin.py:1096
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1100
+#: quantum/plugins/nicira/QuantumPlugin.py:1105
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1127
+#: quantum/plugins/nicira/QuantumPlugin.py:1132
 #, python-format
 msgid "Quantum logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1134
+#: quantum/plugins/nicira/QuantumPlugin.py:1139
 #, python-format
 msgid ""
 "Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1196
+#: quantum/plugins/nicira/QuantumPlugin.py:1201
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1202
+#: quantum/plugins/nicira/QuantumPlugin.py:1207
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1207
+#: quantum/plugins/nicira/QuantumPlugin.py:1212
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1271
+#: quantum/plugins/nicira/QuantumPlugin.py:1276
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1296
+#: quantum/plugins/nicira/QuantumPlugin.py:1301
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1410
-#: quantum/plugins/nicira/QuantumPlugin.py:1455
+#: quantum/plugins/nicira/QuantumPlugin.py:1415
+#: quantum/plugins/nicira/QuantumPlugin.py:1460
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1423
+#: quantum/plugins/nicira/QuantumPlugin.py:1428
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1465
+#: quantum/plugins/nicira/QuantumPlugin.py:1470
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1468
+#: quantum/plugins/nicira/QuantumPlugin.py:1473
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1488
+#: quantum/plugins/nicira/QuantumPlugin.py:1493
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1492
+#: quantum/plugins/nicira/QuantumPlugin.py:1497
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1513
+#: quantum/plugins/nicira/QuantumPlugin.py:1518
 #, python-format
 msgid ""
 "Current router status:%(router_status)s;Status in Quantum "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1521
+#: quantum/plugins/nicira/QuantumPlugin.py:1526
 msgid "Unable to get logical router"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1544
+#: quantum/plugins/nicira/QuantumPlugin.py:1549
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1566
+#: quantum/plugins/nicira/QuantumPlugin.py:1571
 #, python-format
 msgid ""
 "Found %s logical routers not bound to Quantum routers. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1593
+#: quantum/plugins/nicira/QuantumPlugin.py:1598
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1628
+#: quantum/plugins/nicira/QuantumPlugin.py:1633
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1673
+#: quantum/plugins/nicira/QuantumPlugin.py:1678
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1685
+#: quantum/plugins/nicira/QuantumPlugin.py:1690
 #, python-format
 msgid ""
 "Unable to find NVP logical router port for Quantum port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1714
+#: quantum/plugins/nicira/QuantumPlugin.py:1719
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1740
+#: quantum/plugins/nicira/QuantumPlugin.py:1745
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1746
+#: quantum/plugins/nicira/QuantumPlugin.py:1751
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1812
+#: quantum/plugins/nicira/QuantumPlugin.py:1817
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1836
+#: quantum/plugins/nicira/QuantumPlugin.py:1841
 #, python-format
 msgid ""
 "An error occurred while creating NAT rules on the NVP platform for "
 "floating ip:%(floating_ip)s mapped to internal ip:%(internal_ip)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1878
+#: quantum/plugins/nicira/QuantumPlugin.py:1883
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1881
+#: quantum/plugins/nicira/QuantumPlugin.py:1886
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1907
+#: quantum/plugins/nicira/QuantumPlugin.py:1912
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1929
+#: quantum/plugins/nicira/QuantumPlugin.py:1934
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
@@ -6537,69 +6561,69 @@ msgstr ""
 msgid "The network gateway %(gateway_id)s cannot be updated or deleted"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:152
+#: quantum/plugins/nicira/nicira_networkgw_db.py:160
 msgid ""
 "A network identifier must be specified when connecting a network to a "
 "network gateway. Unable to complete operation"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:158
+#: quantum/plugins/nicira/nicira_networkgw_db.py:166
 #, python-format
 msgid ""
 "Invalid keys found among the ones provided in request body: "
 "%(connection_attrs)s."
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:164
+#: quantum/plugins/nicira/nicira_networkgw_db.py:172
 msgid ""
 "In order to specify a segmentation id the segmentation type must be "
 "specified as well"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:168
+#: quantum/plugins/nicira/nicira_networkgw_db.py:176
 msgid "Cannot specify a segmentation id when the segmentation type is flat"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:217
+#: quantum/plugins/nicira/nicira_networkgw_db.py:225
 #, python-format
 msgid "Created network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:230
+#: quantum/plugins/nicira/nicira_networkgw_db.py:237
 #, python-format
 msgid "Updated network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:245
+#: quantum/plugins/nicira/nicira_networkgw_db.py:252
 #, python-format
 msgid "Network gateway '%s' was destroyed."
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:255
+#: quantum/plugins/nicira/nicira_networkgw_db.py:262
 #, python-format
 msgid "Connecting network '%(network_id)s' to gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:296
+#: quantum/plugins/nicira/nicira_networkgw_db.py:303
 #, python-format
 msgid ""
 "Requested network '%(network_id)s' not found.Unable to create network "
 "connection on gateway '%(network_gateway_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:304
+#: quantum/plugins/nicira/nicira_networkgw_db.py:311
 #, python-format
 msgid ""
 "Gateway port for '%(network_gateway_id)s' created on network "
 "'%(network_id)s':%(port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:320
+#: quantum/plugins/nicira/nicira_networkgw_db.py:327
 #, python-format
 msgid "Ensured no Ip addresses are configured on port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:330
+#: quantum/plugins/nicira/nicira_networkgw_db.py:337
 #, python-format
 msgid ""
 "Disconnecting network '%(network_id)s' from gateway "
@@ -7230,11 +7254,11 @@ msgid ""
 "router:'%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:63
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:66
 msgid "Cannot create a gateway with an empty device list"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:89
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:92
 msgid "number of network gateways allowed per tenant, -1 for unlimited"
 msgstr ""
 
@@ -7971,3 +7995,14 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
+#~ msgid "no calling threads waiting for msg_id : %s, message : %s"
+#~ msgstr ""
+
+#~ msgid "Matchmaker unregistered: %s, %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "RuleManager.create_for_sg_rule: adding accept rule"
+#~ " %(rule_id) in portgroup %(port_group_id)s"
+#~ msgstr ""
+

diff --git a/quantum/locale/vi_VN/LC_MESSAGES/quantum.po b/quantum/locale/vi_VN/LC_MESSAGES/quantum.po
index 15101f1ad9a4aeaf8a07265a548e90c8e317515e..7b9d1772ac213cc5e24de23cff60c8a6ec4cb355 100644 (file)
--- a/quantum/locale/vi_VN/LC_MESSAGES/quantum.po
+++ b/quantum/locale/vi_VN/LC_MESSAGES/quantum.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-05-26 12:11+0000\n"
+"POT-Creation-Date: 2013-05-27 12:11+0000\n"
 "PO-Revision-Date: 2013-05-13 06:01+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Vietnamese (Viet Nam) "
@@ -2235,7 +2235,7 @@ msgid ""
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:594 quantum/plugins/nicira/QuantumPlugin.py:1773
+#: quantum/db/l3_db.py:594 quantum/plugins/nicira/QuantumPlugin.py:1778
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
@@ -2808,7 +2808,7 @@ msgid "Was expecting a dict for service definition, found the following: %s"
 msgstr ""
 
 #: quantum/extensions/servicetype.py:160
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:83
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:86
 #, python-format
 msgid "%s: provided data are not iterable"
 msgstr ""
@@ -2832,47 +2832,47 @@ msgstr ""
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:98
+#: quantum/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:184
+#: quantum/openstack/common/lockutils.py:188
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:195
+#: quantum/openstack/common/lockutils.py:199
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:222
+#: quantum/openstack/common/lockutils.py:226
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:230
+#: quantum/openstack/common/lockutils.py:234
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/log.py:226
+#: quantum/openstack/common/log.py:244
 #, python-format
 msgid "Deprecated: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:329
+#: quantum/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:379
+#: quantum/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:537
+#: quantum/openstack/common/log.py:555
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2895,120 +2895,134 @@ msgstr ""
 msgid "in dynamic looping call"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:41
+#: quantum/openstack/common/periodic_task.py:42
 #, python-format
 msgid "Unexpected argument for periodic task creation: %(arg)s."
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:132
+#: quantum/openstack/common/periodic_task.py:133
 #, python-format
 msgid "Skipping periodic task %(task)s because its interval is negative"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:137
+#: quantum/openstack/common/periodic_task.py:138
 #, python-format
 msgid "Skipping periodic task %(task)s because it is disabled"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:175
+#: quantum/openstack/common/periodic_task.py:176
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:183
+#: quantum/openstack/common/periodic_task.py:184
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:394
+#: quantum/openstack/common/policy.py:395
 #, python-format
 msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:404
+#: quantum/openstack/common/policy.py:405
 #, python-format
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:679
+#: quantum/openstack/common/policy.py:680
 #, python-format
 msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:122
+#: quantum/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:137
+#: quantum/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:162
+#: quantum/openstack/common/processutils.py:167
+#: quantum/openstack/common/processutils.py:240
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:174
+#: quantum/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: quantum/openstack/common/service.py:112
-#: quantum/openstack/common/service.py:275
+#: quantum/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
+#: quantum/openstack/common/processutils.py:221
+msgid "Environment not supported over SSH"
+msgstr ""
+
+#: quantum/openstack/common/processutils.py:225
+msgid "process_input not supported over SSH"
+msgstr ""
+
+#: quantum/openstack/common/service.py:113
+#: quantum/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: quantum/openstack/common/service.py:121
-#: quantum/openstack/common/service.py:218
+#: quantum/openstack/common/service.py:122
+#: quantum/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:164
+#: quantum/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:200
+#: quantum/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: quantum/openstack/common/service.py:223
+#: quantum/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: quantum/openstack/common/service.py:230
+#: quantum/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:240
+#: quantum/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: quantum/openstack/common/service.py:257
+#: quantum/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:261
+#: quantum/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:265
+#: quantum/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
 
-#: quantum/openstack/common/service.py:293
+#: quantum/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: quantum/openstack/common/service.py:304
+#: quantum/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -3054,131 +3068,136 @@ msgstr ""
 
 #: quantum/openstack/common/rpc/amqp.py:200
 #, python-format
-msgid "no calling threads waiting for msg_id : %s, message : %s"
+msgid "no calling threads waiting for msg_id : %(msg_id)s, message : %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:208
+#: quantum/openstack/common/rpc/amqp.py:209
 #, python-format
 msgid ""
 "Number of call waiters is greater than warning threshhold: %d. There "
 "could be a MulticallProxyWaiter leak."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:291
+#: quantum/openstack/common/rpc/amqp.py:292
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:337
+#: quantum/openstack/common/rpc/amqp.py:338
 #, python-format
 msgid "UNIQUE_ID is %s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:406
+#: quantum/openstack/common/rpc/amqp.py:407
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:414
+#: quantum/openstack/common/rpc/amqp.py:415
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:415
+#: quantum/openstack/common/rpc/amqp.py:416
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:443
+#: quantum/openstack/common/rpc/amqp.py:444
 #: quantum/openstack/common/rpc/impl_zmq.py:286
 #, python-format
 msgid "Expected exception during message handling (%s)"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:451
+#: quantum/openstack/common/rpc/amqp.py:452
 #: quantum/openstack/common/rpc/impl_zmq.py:292
 msgid "Exception during message handling"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:586
+#: quantum/openstack/common/rpc/amqp.py:587
 #, python-format
 msgid "Making synchronous call on %s ..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:589
+#: quantum/openstack/common/rpc/amqp.py:590
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:623
+#: quantum/openstack/common/rpc/amqp.py:624
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:632
+#: quantum/openstack/common/rpc/amqp.py:633
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:660
+#: quantum/openstack/common/rpc/amqp.py:661
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:74
+#: quantum/openstack/common/rpc/common.py:75
 msgid "An unknown RPC related exception occurred."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:86
+#: quantum/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:104
+#: quantum/openstack/common/rpc/common.py:105
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:121
+#: quantum/openstack/common/rpc/common.py:122
 #, python-format
 msgid ""
 "Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:"
 " \"%(method)s\" info: \"%(info)s\""
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:137
 #: quantum/openstack/common/rpc/common.py:138
 #: quantum/openstack/common/rpc/common.py:139
+#: quantum/openstack/common/rpc/common.py:140
 msgid "<unknown>"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:143
+#: quantum/openstack/common/rpc/common.py:144
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:147
+#: quantum/openstack/common/rpc/common.py:148
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:151
+#: quantum/openstack/common/rpc/common.py:152
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:156
+#: quantum/openstack/common/rpc/common.py:157
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:280
+#: quantum/openstack/common/rpc/common.py:162
+#, python-format
+msgid "Specified RPC version cap, %(version_cap)s, is too low"
+msgstr ""
+
+#: quantum/openstack/common/rpc/common.py:285
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:302
+#: quantum/openstack/common/rpc/common.py:307
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
@@ -3441,25 +3460,30 @@ msgstr ""
 msgid "No match from matchmaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:53
+#: quantum/openstack/common/rpc/impl_zmq.py:852
+#, python-format
+msgid "rpc_zmq_matchmaker = %(orig)s is deprecated; use %(new)s instead"
+msgstr ""
+
+#: quantum/openstack/common/rpc/matchmaker.py:47
 msgid "Match not found by MatchMaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:89
+#: quantum/openstack/common/rpc/matchmaker.py:83
 msgid "Matchmaker does not implement registration or heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:239
+#: quantum/openstack/common/rpc/matchmaker.py:233
 #, python-format
-msgid "Matchmaker unregistered: %s, %s"
+msgid "Matchmaker unregistered: %(key)s, %(host)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:250
+#: quantum/openstack/common/rpc/matchmaker.py:245
 msgid "Register before starting heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:343
-#: quantum/openstack/common/rpc/matchmaker.py:361
+#: quantum/openstack/common/rpc/matchmaker_ring.py:81
+#: quantum/openstack/common/rpc/matchmaker_ring.py:99
 #, python-format
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
@@ -5124,7 +5148,7 @@ msgstr ""
 #: quantum/plugins/midonet/midonet_lib.py:278
 #, python-format
 msgid ""
-"RuleManager.create_for_sg_rule: adding accept rule %(rule_id) in "
+"RuleManager.create_for_sg_rule: adding accept rule %(rule_id)s in "
 "portgroup %(port_group_id)s"
 msgstr ""
 
@@ -5222,7 +5246,7 @@ msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
 #: quantum/plugins/midonet/plugin.py:319
-#: quantum/plugins/nicira/QuantumPlugin.py:1025
+#: quantum/plugins/nicira/QuantumPlugin.py:1030
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
@@ -6089,408 +6113,408 @@ msgstr ""
 msgid "The request has timed out."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:223
+#: quantum/plugins/nicira/QuantumPlugin.py:228
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:258
+#: quantum/plugins/nicira/QuantumPlugin.py:263
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:260
+#: quantum/plugins/nicira/QuantumPlugin.py:265
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:263
+#: quantum/plugins/nicira/QuantumPlugin.py:268
 #, python-format
 msgid ""
 "Unable to create logical router port for quantum port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:285
+#: quantum/plugins/nicira/QuantumPlugin.py:290
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:291
+#: quantum/plugins/nicira/QuantumPlugin.py:296
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
 "associated with Quantum %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:297
+#: quantum/plugins/nicira/QuantumPlugin.py:302
 #, python-format
 msgid ""
 "Unable to plug attachment in router port %(r_port_id)s for quantum port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:342
+#: quantum/plugins/nicira/QuantumPlugin.py:347
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:367
-#: quantum/plugins/nicira/QuantumPlugin.py:402
-#: quantum/plugins/nicira/QuantumPlugin.py:592
+#: quantum/plugins/nicira/QuantumPlugin.py:372
+#: quantum/plugins/nicira/QuantumPlugin.py:407
+#: quantum/plugins/nicira/QuantumPlugin.py:597
 #, python-format
 msgid ""
 "NVP plugin does not support regular VIF ports on external networks. Port "
 "%s will be down."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:387
-#: quantum/plugins/nicira/QuantumPlugin.py:468
-#: quantum/plugins/nicira/QuantumPlugin.py:612
+#: quantum/plugins/nicira/QuantumPlugin.py:392
+#: quantum/plugins/nicira/QuantumPlugin.py:473
+#: quantum/plugins/nicira/QuantumPlugin.py:617
 #, python-format
 msgid ""
 "_nvp_create_port completed for port %(name)s on network %(network_id)s. "
 "The new port id is %(id)s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:391
+#: quantum/plugins/nicira/QuantumPlugin.py:396
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:409
+#: quantum/plugins/nicira/QuantumPlugin.py:414
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:418
+#: quantum/plugins/nicira/QuantumPlugin.py:423
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:424
+#: quantum/plugins/nicira/QuantumPlugin.py:429
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:443
-#: quantum/plugins/nicira/QuantumPlugin.py:876
+#: quantum/plugins/nicira/QuantumPlugin.py:448
+#: quantum/plugins/nicira/QuantumPlugin.py:881
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:455
+#: quantum/plugins/nicira/QuantumPlugin.py:460
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:473
+#: quantum/plugins/nicira/QuantumPlugin.py:478
 msgid "An exception occured while plugging the interface"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:481
+#: quantum/plugins/nicira/QuantumPlugin.py:486
 #, python-format
 msgid ""
 "device_id field must be populated in order to create an external gateway "
 "port for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:489
+#: quantum/plugins/nicira/QuantumPlugin.py:494
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:535
+#: quantum/plugins/nicira/QuantumPlugin.py:540
 #, python-format
 msgid ""
 "_nvp_create_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s. NVP port id is %(nvp_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:573
+#: quantum/plugins/nicira/QuantumPlugin.py:578
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:577
-#: quantum/plugins/nicira/QuantumPlugin.py:1718
+#: quantum/plugins/nicira/QuantumPlugin.py:582
+#: quantum/plugins/nicira/QuantumPlugin.py:1723
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:579
+#: quantum/plugins/nicira/QuantumPlugin.py:584
 #, python-format
 msgid ""
 "_nvp_delete_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:617
+#: quantum/plugins/nicira/QuantumPlugin.py:622
 #, python-format
 msgid "An exception occured while plugging the gateway interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:657
+#: quantum/plugins/nicira/QuantumPlugin.py:662
 #, python-format
 msgid "Unable to find NVP uuid for Quantum port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:686
+#: quantum/plugins/nicira/QuantumPlugin.py:691
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:690
+#: quantum/plugins/nicira/QuantumPlugin.py:695
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:694
+#: quantum/plugins/nicira/QuantumPlugin.py:699
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:698
-#: quantum/plugins/nicira/QuantumPlugin.py:713
+#: quantum/plugins/nicira/QuantumPlugin.py:703
+#: quantum/plugins/nicira/QuantumPlugin.py:718
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:719
+#: quantum/plugins/nicira/QuantumPlugin.py:724
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:750
+#: quantum/plugins/nicira/QuantumPlugin.py:755
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:772
+#: quantum/plugins/nicira/QuantumPlugin.py:777
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:799
+#: quantum/plugins/nicira/QuantumPlugin.py:804
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not yet supported by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:858
+#: quantum/plugins/nicira/QuantumPlugin.py:863
 #, python-format
 msgid "A nvp lport identifier was not found for quantum port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:886
+#: quantum/plugins/nicira/QuantumPlugin.py:891
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:889
+#: quantum/plugins/nicira/QuantumPlugin.py:894
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:915
+#: quantum/plugins/nicira/QuantumPlugin.py:920
 #, python-format
 msgid ""
 "Current network status:%(nvp_net_status)s; Status in Quantum "
 "DB:%(quantum_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:925
-#: quantum/plugins/nicira/QuantumPlugin.py:975
+#: quantum/plugins/nicira/QuantumPlugin.py:930
+#: quantum/plugins/nicira/QuantumPlugin.py:980
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:989
+#: quantum/plugins/nicira/QuantumPlugin.py:994
 #, python-format
 msgid "Logical Switch %s found in quantum database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1004
+#: quantum/plugins/nicira/QuantumPlugin.py:1009
 #, python-format
 msgid ""
 "Found %s logical switches not bound to Quantum networks. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1008
+#: quantum/plugins/nicira/QuantumPlugin.py:1013
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1091
+#: quantum/plugins/nicira/QuantumPlugin.py:1096
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1100
+#: quantum/plugins/nicira/QuantumPlugin.py:1105
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1127
+#: quantum/plugins/nicira/QuantumPlugin.py:1132
 #, python-format
 msgid "Quantum logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1134
+#: quantum/plugins/nicira/QuantumPlugin.py:1139
 #, python-format
 msgid ""
 "Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1196
+#: quantum/plugins/nicira/QuantumPlugin.py:1201
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1202
+#: quantum/plugins/nicira/QuantumPlugin.py:1207
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1207
+#: quantum/plugins/nicira/QuantumPlugin.py:1212
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1271
+#: quantum/plugins/nicira/QuantumPlugin.py:1276
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1296
+#: quantum/plugins/nicira/QuantumPlugin.py:1301
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1410
-#: quantum/plugins/nicira/QuantumPlugin.py:1455
+#: quantum/plugins/nicira/QuantumPlugin.py:1415
+#: quantum/plugins/nicira/QuantumPlugin.py:1460
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1423
+#: quantum/plugins/nicira/QuantumPlugin.py:1428
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1465
+#: quantum/plugins/nicira/QuantumPlugin.py:1470
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1468
+#: quantum/plugins/nicira/QuantumPlugin.py:1473
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1488
+#: quantum/plugins/nicira/QuantumPlugin.py:1493
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1492
+#: quantum/plugins/nicira/QuantumPlugin.py:1497
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1513
+#: quantum/plugins/nicira/QuantumPlugin.py:1518
 #, python-format
 msgid ""
 "Current router status:%(router_status)s;Status in Quantum "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1521
+#: quantum/plugins/nicira/QuantumPlugin.py:1526
 msgid "Unable to get logical router"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1544
+#: quantum/plugins/nicira/QuantumPlugin.py:1549
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1566
+#: quantum/plugins/nicira/QuantumPlugin.py:1571
 #, python-format
 msgid ""
 "Found %s logical routers not bound to Quantum routers. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1593
+#: quantum/plugins/nicira/QuantumPlugin.py:1598
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1628
+#: quantum/plugins/nicira/QuantumPlugin.py:1633
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1673
+#: quantum/plugins/nicira/QuantumPlugin.py:1678
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1685
+#: quantum/plugins/nicira/QuantumPlugin.py:1690
 #, python-format
 msgid ""
 "Unable to find NVP logical router port for Quantum port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1714
+#: quantum/plugins/nicira/QuantumPlugin.py:1719
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1740
+#: quantum/plugins/nicira/QuantumPlugin.py:1745
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1746
+#: quantum/plugins/nicira/QuantumPlugin.py:1751
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1812
+#: quantum/plugins/nicira/QuantumPlugin.py:1817
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1836
+#: quantum/plugins/nicira/QuantumPlugin.py:1841
 #, python-format
 msgid ""
 "An error occurred while creating NAT rules on the NVP platform for "
 "floating ip:%(floating_ip)s mapped to internal ip:%(internal_ip)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1878
+#: quantum/plugins/nicira/QuantumPlugin.py:1883
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1881
+#: quantum/plugins/nicira/QuantumPlugin.py:1886
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1907
+#: quantum/plugins/nicira/QuantumPlugin.py:1912
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1929
+#: quantum/plugins/nicira/QuantumPlugin.py:1934
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
@@ -6536,69 +6560,69 @@ msgstr ""
 msgid "The network gateway %(gateway_id)s cannot be updated or deleted"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:152
+#: quantum/plugins/nicira/nicira_networkgw_db.py:160
 msgid ""
 "A network identifier must be specified when connecting a network to a "
 "network gateway. Unable to complete operation"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:158
+#: quantum/plugins/nicira/nicira_networkgw_db.py:166
 #, python-format
 msgid ""
 "Invalid keys found among the ones provided in request body: "
 "%(connection_attrs)s."
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:164
+#: quantum/plugins/nicira/nicira_networkgw_db.py:172
 msgid ""
 "In order to specify a segmentation id the segmentation type must be "
 "specified as well"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:168
+#: quantum/plugins/nicira/nicira_networkgw_db.py:176
 msgid "Cannot specify a segmentation id when the segmentation type is flat"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:217
+#: quantum/plugins/nicira/nicira_networkgw_db.py:225
 #, python-format
 msgid "Created network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:230
+#: quantum/plugins/nicira/nicira_networkgw_db.py:237
 #, python-format
 msgid "Updated network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:245
+#: quantum/plugins/nicira/nicira_networkgw_db.py:252
 #, python-format
 msgid "Network gateway '%s' was destroyed."
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:255
+#: quantum/plugins/nicira/nicira_networkgw_db.py:262
 #, python-format
 msgid "Connecting network '%(network_id)s' to gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:296
+#: quantum/plugins/nicira/nicira_networkgw_db.py:303
 #, python-format
 msgid ""
 "Requested network '%(network_id)s' not found.Unable to create network "
 "connection on gateway '%(network_gateway_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:304
+#: quantum/plugins/nicira/nicira_networkgw_db.py:311
 #, python-format
 msgid ""
 "Gateway port for '%(network_gateway_id)s' created on network "
 "'%(network_id)s':%(port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:320
+#: quantum/plugins/nicira/nicira_networkgw_db.py:327
 #, python-format
 msgid "Ensured no Ip addresses are configured on port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:330
+#: quantum/plugins/nicira/nicira_networkgw_db.py:337
 #, python-format
 msgid ""
 "Disconnecting network '%(network_id)s' from gateway "
@@ -7229,11 +7253,11 @@ msgid ""
 "router:'%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:63
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:66
 msgid "Cannot create a gateway with an empty device list"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:89
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:92
 msgid "number of network gateways allowed per tenant, -1 for unlimited"
 msgstr ""
 
@@ -7970,3 +7994,14 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
+#~ msgid "no calling threads waiting for msg_id : %s, message : %s"
+#~ msgstr ""
+
+#~ msgid "Matchmaker unregistered: %s, %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "RuleManager.create_for_sg_rule: adding accept rule"
+#~ " %(rule_id) in portgroup %(port_group_id)s"
+#~ msgstr ""
+

diff --git a/quantum/locale/zh_CN/LC_MESSAGES/quantum.po b/quantum/locale/zh_CN/LC_MESSAGES/quantum.po
index 8d1f60abcca727db1094391cd9a4a1972f98e48e..4ce4b76d5c2ac958bcac81a6e0322cdb01c06a3f 100644 (file)
--- a/quantum/locale/zh_CN/LC_MESSAGES/quantum.po
+++ b/quantum/locale/zh_CN/LC_MESSAGES/quantum.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-05-26 12:11+0000\n"
+"POT-Creation-Date: 2013-05-27 12:11+0000\n"
 "PO-Revision-Date: 2013-05-13 06:01+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Chinese (China) "
@@ -2235,7 +2235,7 @@ msgid ""
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:594 quantum/plugins/nicira/QuantumPlugin.py:1773
+#: quantum/db/l3_db.py:594 quantum/plugins/nicira/QuantumPlugin.py:1778
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
@@ -2808,7 +2808,7 @@ msgid "Was expecting a dict for service definition, found the following: %s"
 msgstr ""
 
 #: quantum/extensions/servicetype.py:160
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:83
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:86
 #, python-format
 msgid "%s: provided data are not iterable"
 msgstr ""
@@ -2832,47 +2832,47 @@ msgstr ""
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:98
+#: quantum/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:184
+#: quantum/openstack/common/lockutils.py:188
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:195
+#: quantum/openstack/common/lockutils.py:199
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:222
+#: quantum/openstack/common/lockutils.py:226
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:230
+#: quantum/openstack/common/lockutils.py:234
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/log.py:226
+#: quantum/openstack/common/log.py:244
 #, python-format
 msgid "Deprecated: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:329
+#: quantum/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:379
+#: quantum/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:537
+#: quantum/openstack/common/log.py:555
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
@@ -2895,120 +2895,134 @@ msgstr ""
 msgid "in dynamic looping call"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:41
+#: quantum/openstack/common/periodic_task.py:42
 #, python-format
 msgid "Unexpected argument for periodic task creation: %(arg)s."
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:132
+#: quantum/openstack/common/periodic_task.py:133
 #, python-format
 msgid "Skipping periodic task %(task)s because its interval is negative"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:137
+#: quantum/openstack/common/periodic_task.py:138
 #, python-format
 msgid "Skipping periodic task %(task)s because it is disabled"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:175
+#: quantum/openstack/common/periodic_task.py:176
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:183
+#: quantum/openstack/common/periodic_task.py:184
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:394
+#: quantum/openstack/common/policy.py:395
 #, python-format
 msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:404
+#: quantum/openstack/common/policy.py:405
 #, python-format
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:679
+#: quantum/openstack/common/policy.py:680
 #, python-format
 msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:122
+#: quantum/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:137
+#: quantum/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:162
+#: quantum/openstack/common/processutils.py:167
+#: quantum/openstack/common/processutils.py:240
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:174
+#: quantum/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: quantum/openstack/common/service.py:112
-#: quantum/openstack/common/service.py:275
+#: quantum/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
+#: quantum/openstack/common/processutils.py:221
+msgid "Environment not supported over SSH"
+msgstr ""
+
+#: quantum/openstack/common/processutils.py:225
+msgid "process_input not supported over SSH"
+msgstr ""
+
+#: quantum/openstack/common/service.py:113
+#: quantum/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: quantum/openstack/common/service.py:121
-#: quantum/openstack/common/service.py:218
+#: quantum/openstack/common/service.py:122
+#: quantum/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:164
+#: quantum/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:200
+#: quantum/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: quantum/openstack/common/service.py:223
+#: quantum/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: quantum/openstack/common/service.py:230
+#: quantum/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:240
+#: quantum/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: quantum/openstack/common/service.py:257
+#: quantum/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:261
+#: quantum/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:265
+#: quantum/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
 
-#: quantum/openstack/common/service.py:293
+#: quantum/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: quantum/openstack/common/service.py:304
+#: quantum/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -3054,131 +3068,136 @@ msgstr ""
 
 #: quantum/openstack/common/rpc/amqp.py:200
 #, python-format
-msgid "no calling threads waiting for msg_id : %s, message : %s"
+msgid "no calling threads waiting for msg_id : %(msg_id)s, message : %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:208
+#: quantum/openstack/common/rpc/amqp.py:209
 #, python-format
 msgid ""
 "Number of call waiters is greater than warning threshhold: %d. There "
 "could be a MulticallProxyWaiter leak."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:291
+#: quantum/openstack/common/rpc/amqp.py:292
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:337
+#: quantum/openstack/common/rpc/amqp.py:338
 #, python-format
 msgid "UNIQUE_ID is %s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:406
+#: quantum/openstack/common/rpc/amqp.py:407
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:414
+#: quantum/openstack/common/rpc/amqp.py:415
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:415
+#: quantum/openstack/common/rpc/amqp.py:416
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:443
+#: quantum/openstack/common/rpc/amqp.py:444
 #: quantum/openstack/common/rpc/impl_zmq.py:286
 #, python-format
 msgid "Expected exception during message handling (%s)"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:451
+#: quantum/openstack/common/rpc/amqp.py:452
 #: quantum/openstack/common/rpc/impl_zmq.py:292
 msgid "Exception during message handling"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:586
+#: quantum/openstack/common/rpc/amqp.py:587
 #, python-format
 msgid "Making synchronous call on %s ..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:589
+#: quantum/openstack/common/rpc/amqp.py:590
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:623
+#: quantum/openstack/common/rpc/amqp.py:624
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:632
+#: quantum/openstack/common/rpc/amqp.py:633
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:660
+#: quantum/openstack/common/rpc/amqp.py:661
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:74
+#: quantum/openstack/common/rpc/common.py:75
 msgid "An unknown RPC related exception occurred."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:86
+#: quantum/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:104
+#: quantum/openstack/common/rpc/common.py:105
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:121
+#: quantum/openstack/common/rpc/common.py:122
 #, python-format
 msgid ""
 "Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:"
 " \"%(method)s\" info: \"%(info)s\""
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:137
 #: quantum/openstack/common/rpc/common.py:138
 #: quantum/openstack/common/rpc/common.py:139
+#: quantum/openstack/common/rpc/common.py:140
 msgid "<unknown>"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:143
+#: quantum/openstack/common/rpc/common.py:144
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:147
+#: quantum/openstack/common/rpc/common.py:148
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:151
+#: quantum/openstack/common/rpc/common.py:152
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:156
+#: quantum/openstack/common/rpc/common.py:157
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:280
+#: quantum/openstack/common/rpc/common.py:162
+#, python-format
+msgid "Specified RPC version cap, %(version_cap)s, is too low"
+msgstr ""
+
+#: quantum/openstack/common/rpc/common.py:285
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:302
+#: quantum/openstack/common/rpc/common.py:307
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
@@ -3441,25 +3460,30 @@ msgstr ""
 msgid "No match from matchmaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:53
+#: quantum/openstack/common/rpc/impl_zmq.py:852
+#, python-format
+msgid "rpc_zmq_matchmaker = %(orig)s is deprecated; use %(new)s instead"
+msgstr ""
+
+#: quantum/openstack/common/rpc/matchmaker.py:47
 msgid "Match not found by MatchMaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:89
+#: quantum/openstack/common/rpc/matchmaker.py:83
 msgid "Matchmaker does not implement registration or heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:239
+#: quantum/openstack/common/rpc/matchmaker.py:233
 #, python-format
-msgid "Matchmaker unregistered: %s, %s"
+msgid "Matchmaker unregistered: %(key)s, %(host)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:250
+#: quantum/openstack/common/rpc/matchmaker.py:245
 msgid "Register before starting heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:343
-#: quantum/openstack/common/rpc/matchmaker.py:361
+#: quantum/openstack/common/rpc/matchmaker_ring.py:81
+#: quantum/openstack/common/rpc/matchmaker_ring.py:99
 #, python-format
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
@@ -5124,7 +5148,7 @@ msgstr ""
 #: quantum/plugins/midonet/midonet_lib.py:278
 #, python-format
 msgid ""
-"RuleManager.create_for_sg_rule: adding accept rule %(rule_id) in "
+"RuleManager.create_for_sg_rule: adding accept rule %(rule_id)s in "
 "portgroup %(port_group_id)s"
 msgstr ""
 
@@ -5222,7 +5246,7 @@ msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
 #: quantum/plugins/midonet/plugin.py:319
-#: quantum/plugins/nicira/QuantumPlugin.py:1025
+#: quantum/plugins/nicira/QuantumPlugin.py:1030
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
@@ -6089,408 +6113,408 @@ msgstr ""
 msgid "The request has timed out."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:223
+#: quantum/plugins/nicira/QuantumPlugin.py:228
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:258
+#: quantum/plugins/nicira/QuantumPlugin.py:263
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:260
+#: quantum/plugins/nicira/QuantumPlugin.py:265
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:263
+#: quantum/plugins/nicira/QuantumPlugin.py:268
 #, python-format
 msgid ""
 "Unable to create logical router port for quantum port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:285
+#: quantum/plugins/nicira/QuantumPlugin.py:290
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:291
+#: quantum/plugins/nicira/QuantumPlugin.py:296
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
 "associated with Quantum %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:297
+#: quantum/plugins/nicira/QuantumPlugin.py:302
 #, python-format
 msgid ""
 "Unable to plug attachment in router port %(r_port_id)s for quantum port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:342
+#: quantum/plugins/nicira/QuantumPlugin.py:347
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:367
-#: quantum/plugins/nicira/QuantumPlugin.py:402
-#: quantum/plugins/nicira/QuantumPlugin.py:592
+#: quantum/plugins/nicira/QuantumPlugin.py:372
+#: quantum/plugins/nicira/QuantumPlugin.py:407
+#: quantum/plugins/nicira/QuantumPlugin.py:597
 #, python-format
 msgid ""
 "NVP plugin does not support regular VIF ports on external networks. Port "
 "%s will be down."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:387
-#: quantum/plugins/nicira/QuantumPlugin.py:468
-#: quantum/plugins/nicira/QuantumPlugin.py:612
+#: quantum/plugins/nicira/QuantumPlugin.py:392
+#: quantum/plugins/nicira/QuantumPlugin.py:473
+#: quantum/plugins/nicira/QuantumPlugin.py:617
 #, python-format
 msgid ""
 "_nvp_create_port completed for port %(name)s on network %(network_id)s. "
 "The new port id is %(id)s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:391
+#: quantum/plugins/nicira/QuantumPlugin.py:396
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:409
+#: quantum/plugins/nicira/QuantumPlugin.py:414
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:418
+#: quantum/plugins/nicira/QuantumPlugin.py:423
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:424
+#: quantum/plugins/nicira/QuantumPlugin.py:429
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:443
-#: quantum/plugins/nicira/QuantumPlugin.py:876
+#: quantum/plugins/nicira/QuantumPlugin.py:448
+#: quantum/plugins/nicira/QuantumPlugin.py:881
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:455
+#: quantum/plugins/nicira/QuantumPlugin.py:460
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:473
+#: quantum/plugins/nicira/QuantumPlugin.py:478
 msgid "An exception occured while plugging the interface"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:481
+#: quantum/plugins/nicira/QuantumPlugin.py:486
 #, python-format
 msgid ""
 "device_id field must be populated in order to create an external gateway "
 "port for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:489
+#: quantum/plugins/nicira/QuantumPlugin.py:494
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:535
+#: quantum/plugins/nicira/QuantumPlugin.py:540
 #, python-format
 msgid ""
 "_nvp_create_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s. NVP port id is %(nvp_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:573
+#: quantum/plugins/nicira/QuantumPlugin.py:578
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:577
-#: quantum/plugins/nicira/QuantumPlugin.py:1718
+#: quantum/plugins/nicira/QuantumPlugin.py:582
+#: quantum/plugins/nicira/QuantumPlugin.py:1723
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:579
+#: quantum/plugins/nicira/QuantumPlugin.py:584
 #, python-format
 msgid ""
 "_nvp_delete_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:617
+#: quantum/plugins/nicira/QuantumPlugin.py:622
 #, python-format
 msgid "An exception occured while plugging the gateway interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:657
+#: quantum/plugins/nicira/QuantumPlugin.py:662
 #, python-format
 msgid "Unable to find NVP uuid for Quantum port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:686
+#: quantum/plugins/nicira/QuantumPlugin.py:691
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:690
+#: quantum/plugins/nicira/QuantumPlugin.py:695
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:694
+#: quantum/plugins/nicira/QuantumPlugin.py:699
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:698
-#: quantum/plugins/nicira/QuantumPlugin.py:713
+#: quantum/plugins/nicira/QuantumPlugin.py:703
+#: quantum/plugins/nicira/QuantumPlugin.py:718
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:719
+#: quantum/plugins/nicira/QuantumPlugin.py:724
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:750
+#: quantum/plugins/nicira/QuantumPlugin.py:755
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:772
+#: quantum/plugins/nicira/QuantumPlugin.py:777
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:799
+#: quantum/plugins/nicira/QuantumPlugin.py:804
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not yet supported by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:858
+#: quantum/plugins/nicira/QuantumPlugin.py:863
 #, python-format
 msgid "A nvp lport identifier was not found for quantum port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:886
+#: quantum/plugins/nicira/QuantumPlugin.py:891
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:889
+#: quantum/plugins/nicira/QuantumPlugin.py:894
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:915
+#: quantum/plugins/nicira/QuantumPlugin.py:920
 #, python-format
 msgid ""
 "Current network status:%(nvp_net_status)s; Status in Quantum "
 "DB:%(quantum_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:925
-#: quantum/plugins/nicira/QuantumPlugin.py:975
+#: quantum/plugins/nicira/QuantumPlugin.py:930
+#: quantum/plugins/nicira/QuantumPlugin.py:980
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:989
+#: quantum/plugins/nicira/QuantumPlugin.py:994
 #, python-format
 msgid "Logical Switch %s found in quantum database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1004
+#: quantum/plugins/nicira/QuantumPlugin.py:1009
 #, python-format
 msgid ""
 "Found %s logical switches not bound to Quantum networks. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1008
+#: quantum/plugins/nicira/QuantumPlugin.py:1013
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1091
+#: quantum/plugins/nicira/QuantumPlugin.py:1096
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1100
+#: quantum/plugins/nicira/QuantumPlugin.py:1105
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1127
+#: quantum/plugins/nicira/QuantumPlugin.py:1132
 #, python-format
 msgid "Quantum logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1134
+#: quantum/plugins/nicira/QuantumPlugin.py:1139
 #, python-format
 msgid ""
 "Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1196
+#: quantum/plugins/nicira/QuantumPlugin.py:1201
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1202
+#: quantum/plugins/nicira/QuantumPlugin.py:1207
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1207
+#: quantum/plugins/nicira/QuantumPlugin.py:1212
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1271
+#: quantum/plugins/nicira/QuantumPlugin.py:1276
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1296
+#: quantum/plugins/nicira/QuantumPlugin.py:1301
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1410
-#: quantum/plugins/nicira/QuantumPlugin.py:1455
+#: quantum/plugins/nicira/QuantumPlugin.py:1415
+#: quantum/plugins/nicira/QuantumPlugin.py:1460
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1423
+#: quantum/plugins/nicira/QuantumPlugin.py:1428
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1465
+#: quantum/plugins/nicira/QuantumPlugin.py:1470
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1468
+#: quantum/plugins/nicira/QuantumPlugin.py:1473
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1488
+#: quantum/plugins/nicira/QuantumPlugin.py:1493
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1492
+#: quantum/plugins/nicira/QuantumPlugin.py:1497
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1513
+#: quantum/plugins/nicira/QuantumPlugin.py:1518
 #, python-format
 msgid ""
 "Current router status:%(router_status)s;Status in Quantum "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1521
+#: quantum/plugins/nicira/QuantumPlugin.py:1526
 msgid "Unable to get logical router"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1544
+#: quantum/plugins/nicira/QuantumPlugin.py:1549
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1566
+#: quantum/plugins/nicira/QuantumPlugin.py:1571
 #, python-format
 msgid ""
 "Found %s logical routers not bound to Quantum routers. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1593
+#: quantum/plugins/nicira/QuantumPlugin.py:1598
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1628
+#: quantum/plugins/nicira/QuantumPlugin.py:1633
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1673
+#: quantum/plugins/nicira/QuantumPlugin.py:1678
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1685
+#: quantum/plugins/nicira/QuantumPlugin.py:1690
 #, python-format
 msgid ""
 "Unable to find NVP logical router port for Quantum port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1714
+#: quantum/plugins/nicira/QuantumPlugin.py:1719
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1740
+#: quantum/plugins/nicira/QuantumPlugin.py:1745
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1746
+#: quantum/plugins/nicira/QuantumPlugin.py:1751
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1812
+#: quantum/plugins/nicira/QuantumPlugin.py:1817
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1836
+#: quantum/plugins/nicira/QuantumPlugin.py:1841
 #, python-format
 msgid ""
 "An error occurred while creating NAT rules on the NVP platform for "
 "floating ip:%(floating_ip)s mapped to internal ip:%(internal_ip)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1878
+#: quantum/plugins/nicira/QuantumPlugin.py:1883
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1881
+#: quantum/plugins/nicira/QuantumPlugin.py:1886
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1907
+#: quantum/plugins/nicira/QuantumPlugin.py:1912
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1929
+#: quantum/plugins/nicira/QuantumPlugin.py:1934
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
@@ -6536,69 +6560,69 @@ msgstr ""
 msgid "The network gateway %(gateway_id)s cannot be updated or deleted"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:152
+#: quantum/plugins/nicira/nicira_networkgw_db.py:160
 msgid ""
 "A network identifier must be specified when connecting a network to a "
 "network gateway. Unable to complete operation"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:158
+#: quantum/plugins/nicira/nicira_networkgw_db.py:166
 #, python-format
 msgid ""
 "Invalid keys found among the ones provided in request body: "
 "%(connection_attrs)s."
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:164
+#: quantum/plugins/nicira/nicira_networkgw_db.py:172
 msgid ""
 "In order to specify a segmentation id the segmentation type must be "
 "specified as well"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:168
+#: quantum/plugins/nicira/nicira_networkgw_db.py:176
 msgid "Cannot specify a segmentation id when the segmentation type is flat"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:217
+#: quantum/plugins/nicira/nicira_networkgw_db.py:225
 #, python-format
 msgid "Created network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:230
+#: quantum/plugins/nicira/nicira_networkgw_db.py:237
 #, python-format
 msgid "Updated network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:245
+#: quantum/plugins/nicira/nicira_networkgw_db.py:252
 #, python-format
 msgid "Network gateway '%s' was destroyed."
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:255
+#: quantum/plugins/nicira/nicira_networkgw_db.py:262
 #, python-format
 msgid "Connecting network '%(network_id)s' to gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:296
+#: quantum/plugins/nicira/nicira_networkgw_db.py:303
 #, python-format
 msgid ""
 "Requested network '%(network_id)s' not found.Unable to create network "
 "connection on gateway '%(network_gateway_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:304
+#: quantum/plugins/nicira/nicira_networkgw_db.py:311
 #, python-format
 msgid ""
 "Gateway port for '%(network_gateway_id)s' created on network "
 "'%(network_id)s':%(port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:320
+#: quantum/plugins/nicira/nicira_networkgw_db.py:327
 #, python-format
 msgid "Ensured no Ip addresses are configured on port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:330
+#: quantum/plugins/nicira/nicira_networkgw_db.py:337
 #, python-format
 msgid ""
 "Disconnecting network '%(network_id)s' from gateway "
@@ -7229,11 +7253,11 @@ msgid ""
 "router:'%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:63
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:66
 msgid "Cannot create a gateway with an empty device list"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:89
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:92
 msgid "number of network gateways allowed per tenant, -1 for unlimited"
 msgstr ""
 
@@ -7970,3 +7994,14 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
+#~ msgid "no calling threads waiting for msg_id : %s, message : %s"
+#~ msgstr ""
+
+#~ msgid "Matchmaker unregistered: %s, %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "RuleManager.create_for_sg_rule: adding accept rule"
+#~ " %(rule_id) in portgroup %(port_group_id)s"
+#~ msgstr ""
+

diff --git a/quantum/locale/zh_TW/LC_MESSAGES/quantum.po b/quantum/locale/zh_TW/LC_MESSAGES/quantum.po
index 1ac8823fb63376e1686e0c608df204f061e264bc..1bd383e3aa69ca82e98e3d04c89fa73e3f68a3c4 100644 (file)
--- a/quantum/locale/zh_TW/LC_MESSAGES/quantum.po
+++ b/quantum/locale/zh_TW/LC_MESSAGES/quantum.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-05-26 12:11+0000\n"
+"POT-Creation-Date: 2013-05-27 12:11+0000\n"
 "PO-Revision-Date: 2013-05-22 03:25+0000\n"
 "Last-Translator: daisy.ycguo <daisy.ycguo@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) "
@@ -2248,7 +2248,7 @@ msgid ""
 "assigning a floating IP"
 msgstr "埠 %s 具有多個固定 IP。指派浮動 IP 時必須提供特定 IP"
 
-#: quantum/db/l3_db.py:594 quantum/plugins/nicira/QuantumPlugin.py:1773
+#: quantum/db/l3_db.py:594 quantum/plugins/nicira/QuantumPlugin.py:1778
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr "如果未指定 port_id，則無法指定 fixed_ip_address"
 
@@ -2827,7 +2827,7 @@ msgid "Was expecting a dict for service definition, found the following: %s"
 msgstr "需要服務定義的字典，但發現下列項目：%s"
 
 #: quantum/extensions/servicetype.py:160
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:83
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:86
 #, python-format
 msgid "%s: provided data are not iterable"
 msgstr "%s：提供的資料無法反覆運算"
@@ -2851,47 +2851,47 @@ msgstr "未捕捉到的異常狀況"
 msgid "Original exception being dropped: %s"
 msgstr "正在捨棄原始異常狀況：%s"
 
-#: quantum/openstack/common/lockutils.py:98
+#: quantum/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr "無法釋放獲得的鎖定 `%s`"
 
-#: quantum/openstack/common/lockutils.py:184
+#: quantum/openstack/common/lockutils.py:188
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr "已取得方法 \"%(method)s\" 的號誌 \"%(lock)s\"..."
 
-#: quantum/openstack/common/lockutils.py:195
+#: quantum/openstack/common/lockutils.py:199
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr "正在嘗試抓取方法 \"%(method)s\" 的檔案鎖定 \"%(lock)s\"..."
 
-#: quantum/openstack/common/lockutils.py:222
+#: quantum/openstack/common/lockutils.py:226
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr "已在 %(path)s 處取得方法 \"%(method)s\" 的檔案鎖定 \"%(lock)s\"..."
 
-#: quantum/openstack/common/lockutils.py:230
+#: quantum/openstack/common/lockutils.py:234
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr "已釋放方法 \"%(method)s\" 在 %(path)s 處的檔案鎖定 \"%(lock)s\"..."
 
-#: quantum/openstack/common/log.py:226
+#: quantum/openstack/common/log.py:244
 #, python-format
 msgid "Deprecated: %s"
 msgstr "已淘汰：%s"
 
-#: quantum/openstack/common/log.py:329
+#: quantum/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:379
+#: quantum/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr "Syslog 機能必須是下列其中一項：%s"
 
-#: quantum/openstack/common/log.py:537
+#: quantum/openstack/common/log.py:555
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr "呼叫已淘汰的配置時發生嚴重錯誤：%(msg)s"
@@ -2914,120 +2914,134 @@ msgstr ""
 msgid "in dynamic looping call"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:41
+#: quantum/openstack/common/periodic_task.py:42
 #, python-format
 msgid "Unexpected argument for periodic task creation: %(arg)s."
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:132
+#: quantum/openstack/common/periodic_task.py:133
 #, python-format
 msgid "Skipping periodic task %(task)s because its interval is negative"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:137
+#: quantum/openstack/common/periodic_task.py:138
 #, python-format
 msgid "Skipping periodic task %(task)s because it is disabled"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:175
+#: quantum/openstack/common/periodic_task.py:176
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr "正在執行定期作業 %(full_task_name)s"
 
-#: quantum/openstack/common/periodic_task.py:183
+#: quantum/openstack/common/periodic_task.py:184
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr "執行 %(full_task_name)s 期間發生錯誤：%(e)s"
 
-#: quantum/openstack/common/policy.py:394
+#: quantum/openstack/common/policy.py:395
 #, python-format
 msgid "Failed to understand rule %(rule)s"
 msgstr "無法理解規則 %(rule)s"
 
-#: quantum/openstack/common/policy.py:404
+#: quantum/openstack/common/policy.py:405
 #, python-format
 msgid "No handler for matches of kind %s"
 msgstr "類型為 %s 的相符項沒有處理程式"
 
-#: quantum/openstack/common/policy.py:679
+#: quantum/openstack/common/policy.py:680
 #, python-format
 msgid "Failed to understand rule %(rule)r"
 msgstr "無法理解規則 %(rule)r"
 
-#: quantum/openstack/common/processutils.py:122
+#: quantum/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr "已取得 utils.execute 的不明關鍵字引數：%r"
 
-#: quantum/openstack/common/processutils.py:137
+#: quantum/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "正在執行 cmd（子程序）：%s"
 
-#: quantum/openstack/common/processutils.py:162
+#: quantum/openstack/common/processutils.py:167
+#: quantum/openstack/common/processutils.py:240
 #, python-format
 msgid "Result was %s"
 msgstr "結果是 %s"
 
-#: quantum/openstack/common/processutils.py:174
+#: quantum/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr "%r 失敗。正在重試。"
 
-#: quantum/openstack/common/service.py:112
-#: quantum/openstack/common/service.py:275
+#: quantum/openstack/common/processutils.py:219
+#, fuzzy, python-format
+msgid "Running cmd (SSH): %s"
+msgstr "正在執行 cmd（子程序）：%s"
+
+#: quantum/openstack/common/processutils.py:221
+msgid "Environment not supported over SSH"
+msgstr ""
+
+#: quantum/openstack/common/processutils.py:225
+msgid "process_input not supported over SSH"
+msgstr ""
+
+#: quantum/openstack/common/service.py:113
+#: quantum/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr "一組完整的 CONF："
 
-#: quantum/openstack/common/service.py:121
-#: quantum/openstack/common/service.py:218
+#: quantum/openstack/common/service.py:122
+#: quantum/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr "已捕捉到 %s，正在結束"
 
-#: quantum/openstack/common/service.py:164
+#: quantum/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr "母程序已非預期地當掉，正在結束"
 
-#: quantum/openstack/common/service.py:200
+#: quantum/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr "分岔太快，正在休眠"
 
-#: quantum/openstack/common/service.py:223
+#: quantum/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr "無法處理的異常狀況"
 
-#: quantum/openstack/common/service.py:230
+#: quantum/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr "已啟動子項 %d"
 
-#: quantum/openstack/common/service.py:240
+#: quantum/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr "正在啟動 %d 個工作程式"
 
-#: quantum/openstack/common/service.py:257
+#: quantum/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr "信號 %(sig)d 結束了子項 %(pid)d"
 
-#: quantum/openstack/common/service.py:261
+#: quantum/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr "子項 %(pid)s 已結束，狀態為 %(code)d"
 
-#: quantum/openstack/common/service.py:265
+#: quantum/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr "PID %d 不在子項清單中"
 
-#: quantum/openstack/common/service.py:293
+#: quantum/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr "已捕捉到 %s，正在停止子項"
 
-#: quantum/openstack/common/service.py:304
+#: quantum/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr "正在等待 %d 個子項結束"
@@ -3072,86 +3086,86 @@ msgid "Pool creating new connection"
 msgstr "儲存區正在建立新連線"
 
 #: quantum/openstack/common/rpc/amqp.py:200
-#, python-format
-msgid "no calling threads waiting for msg_id : %s, message : %s"
+#, fuzzy, python-format
+msgid "no calling threads waiting for msg_id : %(msg_id)s, message : %(data)s"
 msgstr "沒有呼叫執行緒正在等待 msg_id：%s，訊息：%s"
 
-#: quantum/openstack/common/rpc/amqp.py:208
+#: quantum/openstack/common/rpc/amqp.py:209
 #, python-format
 msgid ""
 "Number of call waiters is greater than warning threshhold: %d. There "
 "could be a MulticallProxyWaiter leak."
 msgstr "呼叫等待程式的數目大於警告臨界值：%d。可能有 MulticallProxyWaiter 洩漏。"
 
-#: quantum/openstack/common/rpc/amqp.py:291
+#: quantum/openstack/common/rpc/amqp.py:292
 #, python-format
 msgid "unpacked context: %s"
 msgstr "已解壓縮環境定義：%s"
 
-#: quantum/openstack/common/rpc/amqp.py:337
+#: quantum/openstack/common/rpc/amqp.py:338
 #, python-format
 msgid "UNIQUE_ID is %s."
 msgstr "UNIQUE_ID 為 %s。"
 
-#: quantum/openstack/common/rpc/amqp.py:406
+#: quantum/openstack/common/rpc/amqp.py:407
 #, python-format
 msgid "received %s"
 msgstr "收到 %s"
 
-#: quantum/openstack/common/rpc/amqp.py:414
+#: quantum/openstack/common/rpc/amqp.py:415
 #, python-format
 msgid "no method for message: %s"
 msgstr "訊息沒有方法：%s"
 
-#: quantum/openstack/common/rpc/amqp.py:415
+#: quantum/openstack/common/rpc/amqp.py:416
 #, python-format
 msgid "No method for message: %s"
 msgstr "訊息沒有方法：%s"
 
-#: quantum/openstack/common/rpc/amqp.py:443
+#: quantum/openstack/common/rpc/amqp.py:444
 #: quantum/openstack/common/rpc/impl_zmq.py:286
 #, python-format
 msgid "Expected exception during message handling (%s)"
 msgstr "處理訊息期間發生預期的異常狀況 (%s)"
 
-#: quantum/openstack/common/rpc/amqp.py:451
+#: quantum/openstack/common/rpc/amqp.py:452
 #: quantum/openstack/common/rpc/impl_zmq.py:292
 msgid "Exception during message handling"
 msgstr "處理訊息期間發生異常狀況"
 
-#: quantum/openstack/common/rpc/amqp.py:586
+#: quantum/openstack/common/rpc/amqp.py:587
 #, python-format
 msgid "Making synchronous call on %s ..."
 msgstr "正在對 %s 進行同步呼叫..."
 
-#: quantum/openstack/common/rpc/amqp.py:589
+#: quantum/openstack/common/rpc/amqp.py:590
 #, python-format
 msgid "MSG_ID is %s"
 msgstr "MSG_ID 為 %s"
 
-#: quantum/openstack/common/rpc/amqp.py:623
+#: quantum/openstack/common/rpc/amqp.py:624
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr "正在對 %s 進行非同步強制轉型..."
 
-#: quantum/openstack/common/rpc/amqp.py:632
+#: quantum/openstack/common/rpc/amqp.py:633
 msgid "Making asynchronous fanout cast..."
 msgstr "正在進行非同步展開強制轉型..."
 
-#: quantum/openstack/common/rpc/amqp.py:660
+#: quantum/openstack/common/rpc/amqp.py:661
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr "正在傳送關於 %(topic)s 的 %(event_type)s"
 
-#: quantum/openstack/common/rpc/common.py:74
+#: quantum/openstack/common/rpc/common.py:75
 msgid "An unknown RPC related exception occurred."
 msgstr "發生與 RPC 相關的不明異常狀況。"
 
-#: quantum/openstack/common/rpc/common.py:86
+#: quantum/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr "字串格式化作業發生異常狀況"
 
-#: quantum/openstack/common/rpc/common.py:104
+#: quantum/openstack/common/rpc/common.py:105
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
@@ -3160,46 +3174,51 @@ msgstr ""
 "遠端錯誤：%(exc_type)s %(value)s\n"
 "%(traceback)s。"
 
-#: quantum/openstack/common/rpc/common.py:121
+#: quantum/openstack/common/rpc/common.py:122
 #, python-format
 msgid ""
 "Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:"
 " \"%(method)s\" info: \"%(info)s\""
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:137
 #: quantum/openstack/common/rpc/common.py:138
 #: quantum/openstack/common/rpc/common.py:139
+#: quantum/openstack/common/rpc/common.py:140
 msgid "<unknown>"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:143
+#: quantum/openstack/common/rpc/common.py:144
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr "發現重複的訊息 (%(msg_id)s)。正在跳過該訊息。"
 
-#: quantum/openstack/common/rpc/common.py:147
+#: quantum/openstack/common/rpc/common.py:148
 msgid "Invalid reuse of an RPC connection."
 msgstr "重複使用 RPC 連線無效。"
 
-#: quantum/openstack/common/rpc/common.py:151
+#: quantum/openstack/common/rpc/common.py:152
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr "此端點不支援所指定的 RPC 版本 %(version)s。"
 
-#: quantum/openstack/common/rpc/common.py:156
+#: quantum/openstack/common/rpc/common.py:157
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr "此端點不支援所指定的 RPC 封套版本 %(version)s。"
 
-#: quantum/openstack/common/rpc/common.py:280
+#: quantum/openstack/common/rpc/common.py:162
+#, python-format
+msgid "Specified RPC version cap, %(version_cap)s, is too low"
+msgstr ""
+
+#: quantum/openstack/common/rpc/common.py:285
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr "無法清理 %(item)s。索引鍵錯誤 %(err)s"
 
-#: quantum/openstack/common/rpc/common.py:302
+#: quantum/openstack/common/rpc/common.py:307
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr "正在將異常狀況 %s 傳回至呼叫程式"
@@ -3466,25 +3485,30 @@ msgstr "符合程式找不到結果。不進行強制轉型。"
 msgid "No match from matchmaker."
 msgstr "沒有來自符合程式的相符項。"
 
-#: quantum/openstack/common/rpc/matchmaker.py:53
+#: quantum/openstack/common/rpc/impl_zmq.py:852
+#, python-format
+msgid "rpc_zmq_matchmaker = %(orig)s is deprecated; use %(new)s instead"
+msgstr ""
+
+#: quantum/openstack/common/rpc/matchmaker.py:47
 msgid "Match not found by MatchMaker."
 msgstr "符合程式找不到相符項。"
 
-#: quantum/openstack/common/rpc/matchmaker.py:89
+#: quantum/openstack/common/rpc/matchmaker.py:83
 msgid "Matchmaker does not implement registration or heartbeat."
 msgstr "符合程式沒有實作登錄或活動訊號。"
 
-#: quantum/openstack/common/rpc/matchmaker.py:239
-#, python-format
-msgid "Matchmaker unregistered: %s, %s"
+#: quantum/openstack/common/rpc/matchmaker.py:233
+#, fuzzy, python-format
+msgid "Matchmaker unregistered: %(key)s, %(host)s"
 msgstr "已取消登錄符合程式：%s，%s"
 
-#: quantum/openstack/common/rpc/matchmaker.py:250
+#: quantum/openstack/common/rpc/matchmaker.py:245
 msgid "Register before starting heartbeat."
 msgstr "在啟動活動訊號之前登錄。"
 
-#: quantum/openstack/common/rpc/matchmaker.py:343
-#: quantum/openstack/common/rpc/matchmaker.py:361
+#: quantum/openstack/common/rpc/matchmaker_ring.py:81
+#: quantum/openstack/common/rpc/matchmaker_ring.py:99
 #, python-format
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr "沒有索引鍵給主題 '%s' 定義主機，請參閱 ringfile"
@@ -5165,7 +5189,7 @@ msgstr "不知道如何處理規則 = %r"
 #: quantum/plugins/midonet/midonet_lib.py:278
 #, python-format
 msgid ""
-"RuleManager.create_for_sg_rule: adding accept rule %(rule_id) in "
+"RuleManager.create_for_sg_rule: adding accept rule %(rule_id)s in "
 "portgroup %(port_group_id)s"
 msgstr ""
 
@@ -5263,7 +5287,7 @@ msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr "已呼叫 MidonetPluginV2.update_network：ID = %(id)r，網路 = %(network)r"
 
 #: quantum/plugins/midonet/plugin.py:319
-#: quantum/plugins/nicira/QuantumPlugin.py:1025
+#: quantum/plugins/nicira/QuantumPlugin.py:1030
 msgid "admin_state_up=False networks are not supported."
 msgstr "不支援 admin_state_up = False 網路。"
 
@@ -6152,41 +6176,41 @@ msgstr "已禁止要求存取所參照的資源。"
 msgid "The request has timed out."
 msgstr "要求已逾時。"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:223
+#: quantum/plugins/nicira/QuantumPlugin.py:228
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr "無法處理預設 l2 gw 服務：%s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:258
+#: quantum/plugins/nicira/QuantumPlugin.py:263
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr "已建立 NVP 路由器埠：%s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:260
+#: quantum/plugins/nicira/QuantumPlugin.py:265
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr "無法在 NVP 邏輯路由器 %s 上建立埠"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:263
+#: quantum/plugins/nicira/QuantumPlugin.py:268
 #, python-format
 msgid ""
 "Unable to create logical router port for quantum port id %(port_id)s on "
 "router %(router_id)s"
 msgstr "無法給路由器 %(router_id)s 上的 Quantum 埠 ID %(port_id)s 建立邏輯路由器埠"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:285
+#: quantum/plugins/nicira/QuantumPlugin.py:290
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr "已將 %(att)s 連接至 NVP 路由器埠 %(port)s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:291
+#: quantum/plugins/nicira/QuantumPlugin.py:296
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
 "associated with Quantum %(q_port_id)s"
 msgstr "無法將連接裝置插入與 Quantum %(q_port_id)s 相關聯的 NVP 邏輯路由器埠 %(r_port_id)s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:297
+#: quantum/plugins/nicira/QuantumPlugin.py:302
 #, python-format
 msgid ""
 "Unable to plug attachment in router port %(r_port_id)s for quantum port "
@@ -6195,80 +6219,80 @@ msgstr ""
 "無法將連接裝置插入路由器 %(router_id)s 上 Quantum 埠 ID %(q_port_id)s 的路由器埠 "
 "%(r_port_id)s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:342
+#: quantum/plugins/nicira/QuantumPlugin.py:347
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:367
-#: quantum/plugins/nicira/QuantumPlugin.py:402
-#: quantum/plugins/nicira/QuantumPlugin.py:592
+#: quantum/plugins/nicira/QuantumPlugin.py:372
+#: quantum/plugins/nicira/QuantumPlugin.py:407
+#: quantum/plugins/nicira/QuantumPlugin.py:597
 #, python-format
 msgid ""
 "NVP plugin does not support regular VIF ports on external networks. Port "
 "%s will be down."
 msgstr "NVP 外掛程式不支援外部網路上的一般 VIF 埠。埠 %s 將關閉。"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:387
-#: quantum/plugins/nicira/QuantumPlugin.py:468
-#: quantum/plugins/nicira/QuantumPlugin.py:612
+#: quantum/plugins/nicira/QuantumPlugin.py:392
+#: quantum/plugins/nicira/QuantumPlugin.py:473
+#: quantum/plugins/nicira/QuantumPlugin.py:617
 #, python-format
 msgid ""
 "_nvp_create_port completed for port %(name)s on network %(network_id)s. "
 "The new port id is %(id)s."
 msgstr "對網路 %(network_id)s 上埠 %(name)s 執行的 _nvp_create_port 已完成。新的埠 ID 為 %(id)s。"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:391
+#: quantum/plugins/nicira/QuantumPlugin.py:396
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr "將介面插入網路時發生異常狀況：%s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:409
+#: quantum/plugins/nicira/QuantumPlugin.py:414
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr "已在 NVP 平台上刪除了埠 '%s'"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:418
+#: quantum/plugins/nicira/QuantumPlugin.py:423
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr "對網路 %(net_id)s 上埠 %(port_id)s 執行的 _nvp_delete_port 已完成"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:424
+#: quantum/plugins/nicira/QuantumPlugin.py:429
 #, python-format
 msgid "port %s not found in NVP"
 msgstr "在 NVP 中找不到埠 %s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:443
-#: quantum/plugins/nicira/QuantumPlugin.py:876
+#: quantum/plugins/nicira/QuantumPlugin.py:448
+#: quantum/plugins/nicira/QuantumPlugin.py:881
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr "正在忽略異常狀況，因為這意味著埠 '%s' 的同層級已刪除。"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:455
+#: quantum/plugins/nicira/QuantumPlugin.py:460
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr "不容許在外部網路上建立路由器介面埠來作為 '%s'"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:473
+#: quantum/plugins/nicira/QuantumPlugin.py:478
 msgid "An exception occured while plugging the interface"
 msgstr "將介面插入時發生異常狀況"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:481
+#: quantum/plugins/nicira/QuantumPlugin.py:486
 #, python-format
 msgid ""
 "device_id field must be populated in order to create an external gateway "
 "port for network %s"
 msgstr "必須將資料移入 device_id 欄位，才能給網路 %s 建立外部閘道埠"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:489
+#: quantum/plugins/nicira/QuantumPlugin.py:494
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr "在 NVP 後端找不到路由器 %s 的閘道埠"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:535
+#: quantum/plugins/nicira/QuantumPlugin.py:540
 #, python-format
 msgid ""
 "_nvp_create_ext_gw_port completed on external network %(ext_net_id)s, "
@@ -6277,287 +6301,287 @@ msgstr ""
 "已在路由器 %(router_id)s 所連接的外部網路 %(ext_net_id)s 上完成 "
 "_nvp_create_ext_gw_port。NVP 埠 ID 為 %(nvp_port_id)s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:573
+#: quantum/plugins/nicira/QuantumPlugin.py:578
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr "在 NVP 平台上找不到邏輯路由器資源 %s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:577
-#: quantum/plugins/nicira/QuantumPlugin.py:1718
+#: quantum/plugins/nicira/QuantumPlugin.py:582
+#: quantum/plugins/nicira/QuantumPlugin.py:1723
 msgid "Unable to update logical routeron NVP Platform"
 msgstr "無法在 NVP 平台上更新邏輯路由器"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:579
+#: quantum/plugins/nicira/QuantumPlugin.py:584
 #, python-format
 msgid ""
 "_nvp_delete_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s"
 msgstr "已在路由器 %(router_id)s 所連接的外部網路 %(ext_net_id)s 上完成 _nvp_delete_ext_gw_port"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:617
+#: quantum/plugins/nicira/QuantumPlugin.py:622
 #, python-format
 msgid "An exception occured while plugging the gateway interface into network:%s"
 msgstr "將閘道介面插入網路時發生異常狀況：%s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:657
+#: quantum/plugins/nicira/QuantumPlugin.py:662
 #, python-format
 msgid "Unable to find NVP uuid for Quantum port %s"
 msgstr "找不到 Quantum 埠 %s 的 NVP UUID"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:686
+#: quantum/plugins/nicira/QuantumPlugin.py:691
 #, python-format
 msgid "%s required"
 msgstr "需要 %s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:690
+#: quantum/plugins/nicira/QuantumPlugin.py:695
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr "無法使用平面網路類型來指定分段 ID"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:694
+#: quantum/plugins/nicira/QuantumPlugin.py:699
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr "必須使用 VLAN 網路類型來指定分段 ID"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:698
-#: quantum/plugins/nicira/QuantumPlugin.py:713
+#: quantum/plugins/nicira/QuantumPlugin.py:703
+#: quantum/plugins/nicira/QuantumPlugin.py:718
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:719
+#: quantum/plugins/nicira/QuantumPlugin.py:724
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr "不支援 %(net_type_param)s %(net_type_value)s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:750
+#: quantum/plugins/nicira/QuantumPlugin.py:755
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr "交換器沒有可用的埠（已檢查 %d 個）"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:772
+#: quantum/plugins/nicira/QuantumPlugin.py:777
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr "已達到邏輯網路 %s 的邏輯埠數目上限"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:799
+#: quantum/plugins/nicira/QuantumPlugin.py:804
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not yet supported by this plugin. "
 "Ignoring setting for network %s"
 msgstr "此外掛程式尚不支援 admin_state_up = False 的網路。正在忽略對網路 %s 的設定"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:858
+#: quantum/plugins/nicira/QuantumPlugin.py:863
 #, python-format
 msgid "A nvp lport identifier was not found for quantum port '%s'"
 msgstr "找不到 Quantum 埠 '%s' 的 NVP lport ID"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:886
+#: quantum/plugins/nicira/QuantumPlugin.py:891
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr "已對 Tenant 完成 delete_network：%s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:889
+#: quantum/plugins/nicira/QuantumPlugin.py:894
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr "在 NVP 中找不到 lswitch %s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:915
+#: quantum/plugins/nicira/QuantumPlugin.py:920
 #, python-format
 msgid ""
 "Current network status:%(nvp_net_status)s; Status in Quantum "
 "DB:%(quantum_status)s"
 msgstr "現行網路狀態：%(nvp_net_status)s；Quantum DB 中的狀態：%(quantum_status)s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:925
-#: quantum/plugins/nicira/QuantumPlugin.py:975
+#: quantum/plugins/nicira/QuantumPlugin.py:930
+#: quantum/plugins/nicira/QuantumPlugin.py:980
 msgid "Unable to get logical switches"
 msgstr "無法取得邏輯交換器"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:989
+#: quantum/plugins/nicira/QuantumPlugin.py:994
 #, python-format
 msgid "Logical Switch %s found in quantum database but not in NVP."
 msgstr "邏輯交換器 %s 位在 Quantum 資料庫中，但不在 NVP 中。"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1004
+#: quantum/plugins/nicira/QuantumPlugin.py:1009
 #, python-format
 msgid ""
 "Found %s logical switches not bound to Quantum networks. Quantum and NVP "
 "are potentially out of sync"
 msgstr "發現有 %s 個邏輯交換器未連結至 Quantum 網路。Quantum 與 NVP 可能不同步"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1008
+#: quantum/plugins/nicira/QuantumPlugin.py:1013
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr "已對 Tenant %s 完成 get_networks()"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1091
+#: quantum/plugins/nicira/QuantumPlugin.py:1096
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr "在 NVP 中找不到 lswitch %s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1100
+#: quantum/plugins/nicira/QuantumPlugin.py:1105
 msgid "Unable to get ports"
 msgstr "無法取得埠"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1127
+#: quantum/plugins/nicira/QuantumPlugin.py:1132
 #, python-format
 msgid "Quantum logical port %s was not found on NVP"
 msgstr "在 NVP 上找不到 Quantum 邏輯埠 %s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1134
+#: quantum/plugins/nicira/QuantumPlugin.py:1139
 #, python-format
 msgid ""
 "Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
 "potentially out of sync"
 msgstr "發現有 %s 個邏輯埠未連結至 Quantum 埠。Quantum 與 NVP 可能不同步"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1196
+#: quantum/plugins/nicira/QuantumPlugin.py:1201
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1202
+#: quantum/plugins/nicira/QuantumPlugin.py:1207
 msgid "Unable to create port or set port attachment in NVP."
 msgstr "無法在 NVP 中建立埠或設定埠連接裝置。"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1207
+#: quantum/plugins/nicira/QuantumPlugin.py:1212
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr "已對 Tenant %(tenant_id)s 的 NVP 完成 create_port：(%(id)s)"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1271
+#: quantum/plugins/nicira/QuantumPlugin.py:1276
 #, python-format
 msgid "Update port request: %s"
 msgstr "更新埠要求：%s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1296
+#: quantum/plugins/nicira/QuantumPlugin.py:1301
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1410
-#: quantum/plugins/nicira/QuantumPlugin.py:1455
+#: quantum/plugins/nicira/QuantumPlugin.py:1415
+#: quantum/plugins/nicira/QuantumPlugin.py:1460
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr "網路 '%s' 不是有效的外部網路"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1423
+#: quantum/plugins/nicira/QuantumPlugin.py:1428
 msgid "Unable to create logical router on NVP Platform"
 msgstr "無法在 NVP 平台上建立邏輯路由器"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1465
+#: quantum/plugins/nicira/QuantumPlugin.py:1470
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr "在 NVP 平台上找不到邏輯路由器 %s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1468
+#: quantum/plugins/nicira/QuantumPlugin.py:1473
 msgid "Unable to update logical router on NVP Platform"
 msgstr "無法在 NVP 平台上更新邏輯路由器"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1488
+#: quantum/plugins/nicira/QuantumPlugin.py:1493
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr "在 NVP 平台上找不到邏輯路由器 '%s'"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1492
+#: quantum/plugins/nicira/QuantumPlugin.py:1497
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr "無法在 NVP 平台上刪除邏輯路由器"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1513
+#: quantum/plugins/nicira/QuantumPlugin.py:1518
 #, python-format
 msgid ""
 "Current router status:%(router_status)s;Status in Quantum "
 "DB:%(db_router_status)s"
 msgstr "現行路由器狀態：%(router_status)s；Quantum DB 中的狀態：%(db_router_status)s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1521
+#: quantum/plugins/nicira/QuantumPlugin.py:1526
 msgid "Unable to get logical router"
 msgstr "無法取得邏輯路由器"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1544
+#: quantum/plugins/nicira/QuantumPlugin.py:1549
 msgid "Unable to get logical routers from NVP controller"
 msgstr "無法從 NVP 控制器取得邏輯路由器"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1566
+#: quantum/plugins/nicira/QuantumPlugin.py:1571
 #, python-format
 msgid ""
 "Found %s logical routers not bound to Quantum routers. Quantum and NVP "
 "are potentially out of sync"
 msgstr "發現有 %s 個邏輯路由器未連結至 Quantum 路由器。Quantum 與 NVP 可能不同步"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1593
+#: quantum/plugins/nicira/QuantumPlugin.py:1598
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend."
 msgstr "在 NVP 後端找不到路由器 %(router_id)s 所連接的埠 %(port_id)s。"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1628
+#: quantum/plugins/nicira/QuantumPlugin.py:1633
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr "已對子網路 %(subnet_id)s 及路由器 %(router_id)s 完成 Add_router_interface"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1673
+#: quantum/plugins/nicira/QuantumPlugin.py:1678
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend"
 msgstr "在 NVP 後端找不到路由器 %(router_id)s 所連接的埠 %(port_id)s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1685
+#: quantum/plugins/nicira/QuantumPlugin.py:1690
 #, python-format
 msgid ""
 "Unable to find NVP logical router port for Quantum port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr "找不到 Quantum 埠 ID %s 的 NVP 邏輯路由器埠。此埠是否曾與邏輯路由器配對？"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1714
+#: quantum/plugins/nicira/QuantumPlugin.py:1719
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr "在 NVP 平台上找不到邏輯路由器埠資源 %s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1740
+#: quantum/plugins/nicira/QuantumPlugin.py:1745
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr "在 NVP 平台上移除浮動 IP 的 NAT 規則時發生錯誤：%s。"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1746
+#: quantum/plugins/nicira/QuantumPlugin.py:1751
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr "在 NVP 平台上找到的相符 NAT 規則數目不正確"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1812
+#: quantum/plugins/nicira/QuantumPlugin.py:1817
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr "NVP 邏輯路由器埠的位址清單：%s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1836
+#: quantum/plugins/nicira/QuantumPlugin.py:1841
 #, python-format
 msgid ""
 "An error occurred while creating NAT rules on the NVP platform for "
 "floating ip:%(floating_ip)s mapped to internal ip:%(internal_ip)s"
 msgstr "在 NVP 平台上給浮動 IP %(floating_ip)s（已對映到內部 IP %(internal_ip)s）建立 NAT 規則時發生錯誤"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1878
+#: quantum/plugins/nicira/QuantumPlugin.py:1883
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr "埠 '%s' 未與浮動 IP 產生關聯"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1881
+#: quantum/plugins/nicira/QuantumPlugin.py:1886
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1907
+#: quantum/plugins/nicira/QuantumPlugin.py:1912
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr "Create_l2_gw_service 未傳回所新建資源的 UUID：%s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1929
+#: quantum/plugins/nicira/QuantumPlugin.py:1934
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
@@ -6603,69 +6627,69 @@ msgstr "在網路閘道 '%(network_gateway_id)s' 上找不到連線 %(network_ma
 msgid "The network gateway %(gateway_id)s cannot be updated or deleted"
 msgstr "無法更新或刪除網路閘道 %(gateway_id)s"
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:152
+#: quantum/plugins/nicira/nicira_networkgw_db.py:160
 msgid ""
 "A network identifier must be specified when connecting a network to a "
 "network gateway. Unable to complete operation"
 msgstr "將網路連接至網路閘道時必須指定網路 ID。無法完成作業"
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:158
+#: quantum/plugins/nicira/nicira_networkgw_db.py:166
 #, python-format
 msgid ""
 "Invalid keys found among the ones provided in request body: "
 "%(connection_attrs)s."
 msgstr "在要求內文 %(connection_attrs)s 所提供的索引鍵中找到無效的索引鍵。"
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:164
+#: quantum/plugins/nicira/nicira_networkgw_db.py:172
 msgid ""
 "In order to specify a segmentation id the segmentation type must be "
 "specified as well"
 msgstr "必須同時指定分段類型才能指定分段 ID"
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:168
+#: quantum/plugins/nicira/nicira_networkgw_db.py:176
 msgid "Cannot specify a segmentation id when the segmentation type is flat"
 msgstr "當分段類型為平面時，無法指定分段 ID"
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:217
+#: quantum/plugins/nicira/nicira_networkgw_db.py:225
 #, python-format
 msgid "Created network gateway with id:%s"
 msgstr "已建立 ID 為 %s 的網路閘道"
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:230
+#: quantum/plugins/nicira/nicira_networkgw_db.py:237
 #, python-format
 msgid "Updated network gateway with id:%s"
 msgstr "已更新 ID 為 %s 的網路閘道"
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:245
+#: quantum/plugins/nicira/nicira_networkgw_db.py:252
 #, python-format
 msgid "Network gateway '%s' was destroyed."
 msgstr "已毀損網路閘道 '%s'。"
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:255
+#: quantum/plugins/nicira/nicira_networkgw_db.py:262
 #, python-format
 msgid "Connecting network '%(network_id)s' to gateway '%(network_gateway_id)s'"
 msgstr "正在將網路 '%(network_id)s' 連接至閘道 '%(network_gateway_id)s'"
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:296
+#: quantum/plugins/nicira/nicira_networkgw_db.py:303
 #, python-format
 msgid ""
 "Requested network '%(network_id)s' not found.Unable to create network "
 "connection on gateway '%(network_gateway_id)s"
 msgstr "找不到所要求的網路 '%(network_id)s'。無法在閘道 '%(network_gateway_id)s 上建立網路連線"
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:304
+#: quantum/plugins/nicira/nicira_networkgw_db.py:311
 #, python-format
 msgid ""
 "Gateway port for '%(network_gateway_id)s' created on network "
 "'%(network_id)s':%(port_id)s"
 msgstr "已在網路 '%(network_id)s':%(port_id)s 上給 '%(network_gateway_id)s' 建立了閘道埠"
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:320
+#: quantum/plugins/nicira/nicira_networkgw_db.py:327
 #, python-format
 msgid "Ensured no Ip addresses are configured on port %s"
 msgstr "已確定沒有在埠 %s 上配置 IP 位址"
 
-#: quantum/plugins/nicira/nicira_networkgw_db.py:330
+#: quantum/plugins/nicira/nicira_networkgw_db.py:337
 #, python-format
 msgid ""
 "Disconnecting network '%(network_id)s' from gateway "
@@ -7298,11 +7322,11 @@ msgid ""
 "router:'%s'"
 msgstr "對路由器的 meta 資料存取網路執行作業時發生錯誤：'%s'"
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:63
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:66
 msgid "Cannot create a gateway with an empty device list"
 msgstr "無法使用空的裝置清單來建立閘道"
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:89
+#: quantum/plugins/nicira/extensions/nvp_networkgw.py:92
 msgid "number of network gateways allowed per tenant, -1 for unlimited"
 msgstr "每個 Tenant 所容許的網路閘道數目，-1 表示無限制"
 
@@ -8047,3 +8071,8 @@ msgstr "找不到 lswitch：%s"
 msgid "lrouter:%s not found"
 msgstr "找不到 lrouter：%s"
 
+#~ msgid ""
+#~ "RuleManager.create_for_sg_rule: adding accept rule"
+#~ " %(rule_id) in portgroup %(port_group_id)s"
+#~ msgstr ""
+